Platform: RSE: Rename RSE platform files

Renames all 'rss' files to 'rse'. Avoids changes unrelated to moving
files in this commit to keep to commit history clearer.

Signed-off-by: Jamie Fox <jamie.fox@arm.com>
Change-Id: I321aa2cdff6117c869a7128d2866207efd9b3309
diff --git a/docs/platform/arm/index.rst b/docs/platform/arm/index.rst
index 3f0f383..60628f1 100755
--- a/docs/platform/arm/index.rst
+++ b/docs/platform/arm/index.rst
@@ -11,7 +11,7 @@
     Corstone-310 FPGA (AN555) and FVP <mps3/corstone310/README.rst>
     Musca-B1 <musca_b1/readme.rst>
     Musca-S1 <musca_s1/readme.rst>
-    Runtime Security Engine <rss/index>
+    Runtime Security Engine <rse/index>
 
 --------------
 
diff --git a/docs/platform/arm/rss/index.rst b/docs/platform/arm/rse/index.rst
similarity index 81%
rename from docs/platform/arm/rss/index.rst
rename to docs/platform/arm/rse/index.rst
index 9aa236c..73dc11b 100644
--- a/docs/platform/arm/rss/index.rst
+++ b/docs/platform/arm/rse/index.rst
@@ -8,9 +8,9 @@
     :maxdepth: 1
 
     RSE introduction <readme.rst>
-    RSE communication design <rss_comms.rst>
-    RSE hardware key management <rss_key_management.rst>
-    RSE provisioning <rss_provisioning.rst>
+    RSE communication design <rse_comms.rst>
+    RSE hardware key management <rse_key_management.rst>
+    RSE provisioning <rse_provisioning.rst>
 
 RSE also includes the following extra partitions:
 
diff --git a/docs/platform/arm/rss/readme.rst b/docs/platform/arm/rse/readme.rst
similarity index 97%
rename from docs/platform/arm/rss/readme.rst
rename to docs/platform/arm/rse/readme.rst
index 562a0ee..0052f4d 100644
--- a/docs/platform/arm/rss/readme.rst
+++ b/docs/platform/arm/rse/readme.rst
@@ -26,10 +26,10 @@
 -------------
 
 Follow the instructions in :doc:`Build instructions </building/tfm_build_instruction>`.
-Build TF-M with platform name: `arm/rss/<rss platform name>`
+Build TF-M with platform name: `arm/rse/<rse platform name>`
 
 For example for building RSE for Total Compute platforms:
-``-DTFM_PLATFORM=arm/rss/tc``
+``-DTFM_PLATFORM=arm/rse/tc``
 
 Signing host images
 -------------------
@@ -182,7 +182,7 @@
 when ``TFM_DUMMY_PROVISIONING`` is enabled, except that it will not
 automatically perform the reset once each provisioning state is complete. For
 more details about provisioning flows, see
-:doc:`RSE provisioning </platform/arm/rss/rss_provisioning>`.
+:doc:`RSE provisioning </platform/arm/rse/rse_provisioning>`.
 
 --------------
 
diff --git a/docs/platform/arm/rss/rss_comms.rst b/docs/platform/arm/rse/rse_comms.rst
similarity index 90%
rename from docs/platform/arm/rss/rss_comms.rst
rename to docs/platform/arm/rse/rse_comms.rst
index bca8b7b..14b0b13 100644
--- a/docs/platform/arm/rss/rss_comms.rst
+++ b/docs/platform/arm/rse/rse_comms.rst
@@ -135,18 +135,18 @@
 ************************
 
 The RSE side of the communication implementation is located in
-``platform/ext/target/arm/rss/common/rss_comms``. The implementation is
+``platform/ext/target/arm/rse/common/rse_comms``. The implementation is
 structured as follows:
 
-- ``rss_comms.c``: Implements the TF-M RPC layer using RSE comms implementation.
-- ``rss_comms_hal.c``: Abstracts MHU message sending and receiving.
+- ``rse_comms.c``: Implements the TF-M RPC layer using RSE comms implementation.
+- ``rse_comms_hal.c``: Abstracts MHU message sending and receiving.
 
-- ``rss_comms_protocol.c``: The common part of the RSE comms protocol.
-- ``rss_comms_protocol_embed.c``: The embed RSE comms protocol.
-- ``rss_comms_protocol_protocol_access.c``: The pointer access RSE comms protocol.
+- ``rse_comms_protocol.c``: The common part of the RSE comms protocol.
+- ``rse_comms_protocol_embed.c``: The embed RSE comms protocol.
+- ``rse_comms_protocol_protocol_access.c``: The pointer access RSE comms protocol.
 
-- ``rss_comms_atu.c``: Allocates and frees ATU regions for host pointer access.
-- ``rss_comms_permissions_hal.c``: Checks service access permissions and pointer validity.
+- ``rse_comms_atu.c``: Allocates and frees ATU regions for host pointer access.
+- ``rse_comms_permissions_hal.c``: Checks service access permissions and pointer validity.
 
 A reference implementation of the client side of the RSE comms is available in
 the Trusted Firmware-A repository.
diff --git a/docs/platform/arm/rss/rss_key_management.rst b/docs/platform/arm/rse/rse_key_management.rst
similarity index 100%
rename from docs/platform/arm/rss/rss_key_management.rst
rename to docs/platform/arm/rse/rse_key_management.rst
diff --git a/docs/platform/arm/rss/rss_provisioning.rst b/docs/platform/arm/rse/rse_provisioning.rst
similarity index 100%
rename from docs/platform/arm/rss/rss_provisioning.rst
rename to docs/platform/arm/rse/rse_provisioning.rst
diff --git a/docs/platform/platform_introduction.rst b/docs/platform/platform_introduction.rst
index 3301415..0075e73 100644
--- a/docs/platform/platform_introduction.rst
+++ b/docs/platform/platform_introduction.rst
@@ -64,7 +64,7 @@
 
     - Runtime Security Engine (RSE):
 
-        - :doc:`RSE. </platform/arm/rss/readme>`
+        - :doc:`RSE. </platform/arm/rse/readme>`
 
 The document :doc:`Platform Deprecation and Removal </integration_guide/platform/platform_deprecation>`
 lists the deprecated platforms, removed from the upstream.
diff --git a/docs/releases/1.7.0.rst b/docs/releases/1.7.0.rst
index fbb4e4f..d8f817b 100644
--- a/docs/releases/1.7.0.rst
+++ b/docs/releases/1.7.0.rst
@@ -25,7 +25,7 @@
 New platforms supported
 =======================
 
- - :doc:`/platform/arm/rss/readme`
+ - :doc:`/platform/arm/rse/readme`
  - Platform `arm/mps3/Polaris` renamed to :doc:`Corstone-310 </platform/arm/mps3/corstone310/README>`
 
 Deprecated platforms and features
diff --git a/platform/ext/target/arm/rss/common/CMakeLists.txt b/platform/ext/target/arm/rse/common/CMakeLists.txt
similarity index 96%
rename from platform/ext/target/arm/rss/common/CMakeLists.txt
rename to platform/ext/target/arm/rse/common/CMakeLists.txt
index 61c05c1..f99d15a 100644
--- a/platform/ext/target/arm/rss/common/CMakeLists.txt
+++ b/platform/ext/target/arm/rse/common/CMakeLists.txt
@@ -41,7 +41,7 @@
 # Specify the location of platform specific build dependencies.
 target_sources(tfm_s
     PRIVATE
-        ${CMAKE_CURRENT_SOURCE_DIR}/device/source/startup_rss.c
+        ${CMAKE_CURRENT_SOURCE_DIR}/device/source/startup_rse.c
 )
 target_add_scatter_file(tfm_s
         $<$<C_COMPILER_ID:ARMClang>:${PLATFORM_DIR}/ext/common/armclang/tfm_common_s.sct>
@@ -50,7 +50,7 @@
 
 target_sources(bl2
     PRIVATE
-        ${CMAKE_CURRENT_SOURCE_DIR}/device/source/startup_rss.c
+        ${CMAKE_CURRENT_SOURCE_DIR}/device/source/startup_rse.c
         $<$<BOOL:${PLATFORM_HAS_BOOT_DMA}>:${CMAKE_CURRENT_SOURCE_DIR}/bl2/boot_dma.c>
 )
 
@@ -71,20 +71,20 @@
 
 target_sources(bl1_1
     PRIVATE
-        ${CMAKE_CURRENT_SOURCE_DIR}/device/source/startup_rss_bl1_1.c
+        ${CMAKE_CURRENT_SOURCE_DIR}/device/source/startup_rse_bl1_1.c
 )
 target_add_scatter_file(bl1_1
-        $<$<C_COMPILER_ID:ARMClang>:${CMAKE_CURRENT_SOURCE_DIR}/device/source/armclang/rss_bl1_1.sct>
-        $<$<C_COMPILER_ID:GNU>:${CMAKE_CURRENT_SOURCE_DIR}/device/source/gcc/rss_bl1_1.ld>
+        $<$<C_COMPILER_ID:ARMClang>:${CMAKE_CURRENT_SOURCE_DIR}/device/source/armclang/rse_bl1_1.sct>
+        $<$<C_COMPILER_ID:GNU>:${CMAKE_CURRENT_SOURCE_DIR}/device/source/gcc/rse_bl1_1.ld>
 )
 
 target_sources(bl1_2
     PRIVATE
-        ${CMAKE_CURRENT_SOURCE_DIR}/device/source/startup_rss.c
+        ${CMAKE_CURRENT_SOURCE_DIR}/device/source/startup_rse.c
 )
 target_add_scatter_file(bl1_2
-        $<$<C_COMPILER_ID:ARMClang>:${CMAKE_CURRENT_SOURCE_DIR}/device/source/armclang/rss_bl1_2.sct>
-        $<$<C_COMPILER_ID:GNU>:${CMAKE_CURRENT_SOURCE_DIR}/device/source/gcc/rss_bl1_2.ld>
+        $<$<C_COMPILER_ID:ARMClang>:${CMAKE_CURRENT_SOURCE_DIR}/device/source/armclang/rse_bl1_2.sct>
+        $<$<C_COMPILER_ID:GNU>:${CMAKE_CURRENT_SOURCE_DIR}/device/source/gcc/rse_bl1_2.ld>
 )
 
 
@@ -94,11 +94,11 @@
 #========================= Platform Secure ====================================#
 
 if (TFM_MULTI_CORE_TOPOLOGY)
-    add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/rss_comms rss_comms)
+    add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/rse_comms rse_comms)
 endif()
 
 if (RSS_AMOUNT GREATER 1)
-    add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/rss_handshake rss_handshake)
+    add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/rse_handshake rse_handshake)
 endif()
 
 add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/provisioning provisioning)
@@ -143,7 +143,7 @@
         libraries/dma350_lib.c
         $<$<BOOL:${RSS_USE_SDS_LIB}>:${CMAKE_CURRENT_SOURCE_DIR}/libraries/sds.c>
         $<$<BOOL:${RSS_USE_SDS_LIB}>:${CMAKE_CURRENT_SOURCE_DIR}/libraries/sds_svc.c>
-        native_drivers/atu_rss_drv.c
+        native_drivers/atu_rse_drv.c
         native_drivers/dma350_drv.c
         native_drivers/dma350_ch_drv.c
         native_drivers/kmu_drv.c
@@ -152,7 +152,7 @@
         $<$<EQUAL:${PLAT_MHU_VERSION},2>:${CMAKE_CURRENT_SOURCE_DIR}/native_drivers/mhu_wrapper_v2_x.c>
         $<$<EQUAL:${PLAT_MHU_VERSION},3>:${CMAKE_CURRENT_SOURCE_DIR}/native_drivers/mhu_v3_x.c>
         $<$<EQUAL:${PLAT_MHU_VERSION},3>:${CMAKE_CURRENT_SOURCE_DIR}/native_drivers/mhu_wrapper_v3_x.c>
-        native_drivers/ppc_rss_drv.c
+        native_drivers/ppc_rse_drv.c
         native_drivers/integrity_checker_drv.c
         ${PLATFORM_DIR}/ext/target/arm/drivers/counter/armv8m/syscounter_armv8-m_cntrl_drv.c
         ${PLATFORM_DIR}/ext/target/arm/drivers/mpc_sie/mpc_sie_drv.c
@@ -196,7 +196,7 @@
         $<$<BOOL:${TFM_PARTITION_DELEGATED_ATTESTATION}>:RSS_BOOT_KEYS_CCA>
         $<$<BOOL:${TFM_PARTITION_DPE}>:RSS_BOOT_KEYS_DPE>
         # Needed for DMA-350 library
-        CMSIS_device_header="rss.h"
+        CMSIS_device_header="rse.h"
         $<$<BOOL:${PLATFORM_SVC_HANDLERS}>:PLATFORM_SVC_HANDLERS>
         $<$<BOOL:${RSS_USE_SDS_LIB}>:RSS_USE_SDS_LIB>
 )
@@ -233,9 +233,9 @@
         $<$<BOOL:${PLATFORM_HAS_NI_TOWER}>:${CMAKE_CURRENT_SOURCE_DIR}/host_drivers/ni_tower/apu/ni_tower_apu_drv.c>
         $<$<BOOL:${PLATFORM_HAS_NI_TOWER}>:${CMAKE_CURRENT_SOURCE_DIR}/host_drivers/ni_tower/discovery/ni_tower_discovery_drv.c>
         $<$<BOOL:${PLATFORM_HAS_NI_TOWER}>:${CMAKE_CURRENT_SOURCE_DIR}/host_drivers/ni_tower/psam/ni_tower_psam_drv.c>
-        $<$<BOOL:${PLATFORM_HAS_NI_TOWER}>:${CMAKE_CURRENT_SOURCE_DIR}/host_drivers/ni_tower/ni_tower_rss_drv.c>
+        $<$<BOOL:${PLATFORM_HAS_NI_TOWER}>:${CMAKE_CURRENT_SOURCE_DIR}/host_drivers/ni_tower/ni_tower_rse_drv.c>
         $<$<BOOL:${PLATFORM_HAS_BOOT_DMA}>:${CMAKE_CURRENT_SOURCE_DIR}/libraries/dma350_lib.c>
-        native_drivers/atu_rss_drv.c
+        native_drivers/atu_rse_drv.c
         $<$<BOOL:${PLATFORM_HAS_BOOT_DMA}>:${CMAKE_CURRENT_SOURCE_DIR}/native_drivers/dma350_ch_drv.c>
         $<$<BOOL:${PLATFORM_HAS_BOOT_DMA}>:${CMAKE_CURRENT_SOURCE_DIR}/native_drivers/dma350_drv.c>
         native_drivers/kmu_drv.c
@@ -286,7 +286,7 @@
         # Needed for DMA-350 library
         $<$<BOOL:${PLATFORM_HAS_BOOT_DMA}>:PLATFORM_HAS_BOOT_DMA>
         $<$<BOOL:${PLATFORM_BOOT_DMA_MIN_SIZE_REQ}>:BOOT_DMA_MIN_SIZE_REQ=${PLATFORM_BOOT_DMA_MIN_SIZE_REQ}>
-        $<$<BOOL:${PLATFORM_HAS_BOOT_DMA}>:CMSIS_device_header="rss.h">
+        $<$<BOOL:${PLATFORM_HAS_BOOT_DMA}>:CMSIS_device_header="rse.h">
         $<$<BOOL:${PLATFORM_HAS_NI_TOWER}>:PLATFORM_HAS_NI_TOWER>
 )
 
@@ -302,7 +302,7 @@
         ./bl1/boot_hal_bl1_1.c
         ./device/source/device_definition.c
         ./device/source/system_core_init.c
-        ./native_drivers/atu_rss_drv.c
+        ./native_drivers/atu_rse_drv.c
         ./native_drivers/kmu_drv.c
         ./native_drivers/lcm_drv.c
         $<$<EQUAL:${PLAT_MHU_VERSION},2>:${CMAKE_CURRENT_SOURCE_DIR}/native_drivers/mhu_v2_x.c>
@@ -318,9 +318,9 @@
         $<$<BOOL:${RSS_DEBUG_UART}>:${PLATFORM_DIR}/ext/target/arm/drivers/usart/cmsdk/uart_cmsdk_drv.c>
         ./dpa_hardened_word_copy.c
         ./cc312/cc3xx_aes_external_key_loader.c
-        $<$<BOOL:${RSS_ENABLE_BRINGUP_HELPERS}>:${CMAKE_CURRENT_SOURCE_DIR}/bringup_helpers/rss_bringup_helpers.c>
-        $<$<BOOL:${RSS_BRINGUP_OTP_EMULATION}>:${CMAKE_CURRENT_SOURCE_DIR}/bringup_helpers/rss_bl1_2_image_otp_or_flash.c>
-        ./rss_key_derivation.c
+        $<$<BOOL:${RSS_ENABLE_BRINGUP_HELPERS}>:${CMAKE_CURRENT_SOURCE_DIR}/bringup_helpers/rse_bringup_helpers.c>
+        $<$<BOOL:${RSS_BRINGUP_OTP_EMULATION}>:${CMAKE_CURRENT_SOURCE_DIR}/bringup_helpers/rse_bl1_2_image_otp_or_flash.c>
+        ./rse_key_derivation.c
         $<$<BOOL:${RSS_USE_ROM_LIB_FROM_SRAM}>:${CMAKE_CURRENT_SOURCE_DIR}/bl1/bl1_patch_stubs.c>
 )
 
@@ -378,7 +378,7 @@
             -finstrument-functions
             # Don't insert stub function into the stub functions, or the early
             # startup files where we are still setting up the GOT
-            -finstrument-functions-exclude-file-list=bl1_patch_stubs,startup_rss_bl1_1
+            -finstrument-functions-exclude-file-list=bl1_patch_stubs,startup_rse_bl1_1
             # Don't insert stub function into functions where the stack isn't
             # valid.
             -finstrument-functions-exclude-function-list=boot_platform_quit,boot_jump_to_next_image
@@ -406,7 +406,7 @@
     PRIVATE
         $<$<NOT:$<BOOL:${TFM_BL1_SOFTWARE_CRYPTO}>>:${CMAKE_CURRENT_SOURCE_DIR}/bl1/cc312_rom_crypto.c>
         $<$<AND:$<NOT:$<BOOL:${RSS_OTP_TRNG}>>,$<NOT:$<BOOL:${TFM_BL1_DUMMY_TRNG}>>>:${CMAKE_CURRENT_SOURCE_DIR}/bl1/cc312_rom_trng.c>
-        $<$<AND:$<BOOL:${RSS_OTP_TRNG}>,$<NOT:$<BOOL:${TFM_BL1_DUMMY_TRNG}>>>:${CMAKE_CURRENT_SOURCE_DIR}/rss_trng.c>
+        $<$<AND:$<BOOL:${RSS_OTP_TRNG}>,$<NOT:$<BOOL:${TFM_BL1_DUMMY_TRNG}>>>:${CMAKE_CURRENT_SOURCE_DIR}/rse_trng.c>
 )
 
 target_link_libraries(cc312_rom
@@ -694,7 +694,7 @@
         DESTINATION ${INSTALL_PLATFORM_NS_DIR}/ext/driver)
 
 install(FILES       device/source/device_definition.c
-                    device/source/startup_rss.c
+                    device/source/startup_rse.c
                     device/source/system_core_init.c
         DESTINATION ${INSTALL_PLATFORM_NS_DIR}/device/source
 )
diff --git a/platform/ext/target/arm/rss/common/attest_hal.c b/platform/ext/target/arm/rse/common/attest_hal.c
similarity index 100%
rename from platform/ext/target/arm/rss/common/attest_hal.c
rename to platform/ext/target/arm/rse/common/attest_hal.c
diff --git a/platform/ext/target/arm/rss/common/bl1/bl1_1_shared_symbols.txt b/platform/ext/target/arm/rse/common/bl1/bl1_1_shared_symbols.txt
similarity index 100%
rename from platform/ext/target/arm/rss/common/bl1/bl1_1_shared_symbols.txt
rename to platform/ext/target/arm/rse/common/bl1/bl1_1_shared_symbols.txt
diff --git a/platform/ext/target/arm/rss/common/bl1/bl1_patch_stubs.c b/platform/ext/target/arm/rse/common/bl1/bl1_patch_stubs.c
similarity index 100%
rename from platform/ext/target/arm/rss/common/bl1/bl1_patch_stubs.c
rename to platform/ext/target/arm/rse/common/bl1/bl1_patch_stubs.c
diff --git a/platform/ext/target/arm/rss/common/bl1/boot_hal_bl1_1.c b/platform/ext/target/arm/rse/common/bl1/boot_hal_bl1_1.c
similarity index 98%
rename from platform/ext/target/arm/rss/common/bl1/boot_hal_bl1_1.c
rename to platform/ext/target/arm/rse/common/bl1/boot_hal_bl1_1.c
index 10a3793..093ec56 100644
--- a/platform/ext/target/arm/rss/common/bl1/boot_hal_bl1_1.c
+++ b/platform/ext/target/arm/rse/common/bl1/boot_hal_bl1_1.c
@@ -25,10 +25,10 @@
 #include <string.h>
 #include "cmsis_compiler.h"
 #ifdef RSS_ENABLE_BRINGUP_HELPERS
-#include "rss_bringup_helpers.h"
+#include "rse_bringup_helpers.h"
 #endif /* RSS_ENABLE_BRINGUP_HELPERS */
 #ifdef RSS_BRINGUP_OTP_EMULATION
-#include "rss_otp_emulation.h"
+#include "rse_otp_emulation.h"
 #endif /* RSS_BRINGUP_OTP_EMULATION */
 #include "trng.h"
 
diff --git a/platform/ext/target/arm/rss/common/bl1/boot_hal_bl1_2.c b/platform/ext/target/arm/rse/common/bl1/boot_hal_bl1_2.c
similarity index 99%
rename from platform/ext/target/arm/rss/common/bl1/boot_hal_bl1_2.c
rename to platform/ext/target/arm/rse/common/bl1/boot_hal_bl1_2.c
index e7f493ba..662de22 100644
--- a/platform/ext/target/arm/rss/common/bl1/boot_hal_bl1_2.c
+++ b/platform/ext/target/arm/rse/common/bl1/boot_hal_bl1_2.c
@@ -30,13 +30,13 @@
 #include "plat_def_fip_uuid.h"
 #endif
 #include "tfm_plat_nv_counters.h"
-#include "rss_key_derivation.h"
-#include "rss_kmu_slot_ids.h"
+#include "rse_key_derivation.h"
+#include "rse_kmu_slot_ids.h"
 #include "mpu_armv8m_drv.h"
 #include "cmsis.h"
 #include "dpa_hardened_word_copy.h"
 #if RSS_AMOUNT > 1
-#include "rss_handshake.h"
+#include "rse_handshake.h"
 #endif
 
 #ifdef PLATFORM_PSA_ADAC_SECURE_DEBUG
diff --git a/platform/ext/target/arm/rss/common/bl1/cc312_rom_crypto.c b/platform/ext/target/arm/rse/common/bl1/cc312_rom_crypto.c
similarity index 100%
rename from platform/ext/target/arm/rss/common/bl1/cc312_rom_crypto.c
rename to platform/ext/target/arm/rse/common/bl1/cc312_rom_crypto.c
diff --git a/platform/ext/target/arm/rss/common/bl1/cc312_rom_trng.c b/platform/ext/target/arm/rse/common/bl1/cc312_rom_trng.c
similarity index 100%
rename from platform/ext/target/arm/rss/common/bl1/cc312_rom_trng.c
rename to platform/ext/target/arm/rse/common/bl1/cc312_rom_trng.c
diff --git a/platform/ext/target/arm/rss/common/bl1/scripts/create_bl1_1_dma_bin.py b/platform/ext/target/arm/rse/common/bl1/scripts/create_bl1_1_dma_bin.py
similarity index 100%
rename from platform/ext/target/arm/rss/common/bl1/scripts/create_bl1_1_dma_bin.py
rename to platform/ext/target/arm/rse/common/bl1/scripts/create_bl1_1_dma_bin.py
diff --git a/platform/ext/target/arm/rss/common/bl1/scripts/dma_config.yaml b/platform/ext/target/arm/rse/common/bl1/scripts/dma_config.yaml
similarity index 100%
rename from platform/ext/target/arm/rss/common/bl1/scripts/dma_config.yaml
rename to platform/ext/target/arm/rse/common/bl1/scripts/dma_config.yaml
diff --git a/platform/ext/target/arm/rss/common/bl1/scripts/include/program0_cmd0.yaml b/platform/ext/target/arm/rse/common/bl1/scripts/include/program0_cmd0.yaml
similarity index 100%
rename from platform/ext/target/arm/rss/common/bl1/scripts/include/program0_cmd0.yaml
rename to platform/ext/target/arm/rse/common/bl1/scripts/include/program0_cmd0.yaml
diff --git a/platform/ext/target/arm/rss/common/bl1/scripts/include/program0_cmd1.yaml b/platform/ext/target/arm/rse/common/bl1/scripts/include/program0_cmd1.yaml
similarity index 100%
rename from platform/ext/target/arm/rss/common/bl1/scripts/include/program0_cmd1.yaml
rename to platform/ext/target/arm/rse/common/bl1/scripts/include/program0_cmd1.yaml
diff --git a/platform/ext/target/arm/rss/common/bl1/scripts/include/program1_cmd0.yaml b/platform/ext/target/arm/rse/common/bl1/scripts/include/program1_cmd0.yaml
similarity index 100%
rename from platform/ext/target/arm/rss/common/bl1/scripts/include/program1_cmd0.yaml
rename to platform/ext/target/arm/rse/common/bl1/scripts/include/program1_cmd0.yaml
diff --git a/platform/ext/target/arm/rss/common/bl1/scripts/include/program1_cmd1.yaml b/platform/ext/target/arm/rse/common/bl1/scripts/include/program1_cmd1.yaml
similarity index 100%
rename from platform/ext/target/arm/rss/common/bl1/scripts/include/program1_cmd1.yaml
rename to platform/ext/target/arm/rse/common/bl1/scripts/include/program1_cmd1.yaml
diff --git a/platform/ext/target/arm/rss/common/bl1/scripts/include/program2_cmd0.yaml b/platform/ext/target/arm/rse/common/bl1/scripts/include/program2_cmd0.yaml
similarity index 100%
rename from platform/ext/target/arm/rss/common/bl1/scripts/include/program2_cmd0.yaml
rename to platform/ext/target/arm/rse/common/bl1/scripts/include/program2_cmd0.yaml
diff --git a/platform/ext/target/arm/rss/common/bl1/scripts/include/program2_cmd1.yaml b/platform/ext/target/arm/rse/common/bl1/scripts/include/program2_cmd1.yaml
similarity index 100%
rename from platform/ext/target/arm/rss/common/bl1/scripts/include/program2_cmd1.yaml
rename to platform/ext/target/arm/rse/common/bl1/scripts/include/program2_cmd1.yaml
diff --git a/platform/ext/target/arm/rss/common/bl1/scripts/include/program2_cmd2.yaml b/platform/ext/target/arm/rse/common/bl1/scripts/include/program2_cmd2.yaml
similarity index 100%
rename from platform/ext/target/arm/rss/common/bl1/scripts/include/program2_cmd2.yaml
rename to platform/ext/target/arm/rse/common/bl1/scripts/include/program2_cmd2.yaml
diff --git a/platform/ext/target/arm/rss/common/bl1/scripts/include/program3_cmd0.yaml b/platform/ext/target/arm/rse/common/bl1/scripts/include/program3_cmd0.yaml
similarity index 100%
rename from platform/ext/target/arm/rss/common/bl1/scripts/include/program3_cmd0.yaml
rename to platform/ext/target/arm/rse/common/bl1/scripts/include/program3_cmd0.yaml
diff --git a/platform/ext/target/arm/rss/common/bl1/scripts/include/program3_cmd1.yaml b/platform/ext/target/arm/rse/common/bl1/scripts/include/program3_cmd1.yaml
similarity index 100%
rename from platform/ext/target/arm/rss/common/bl1/scripts/include/program3_cmd1.yaml
rename to platform/ext/target/arm/rse/common/bl1/scripts/include/program3_cmd1.yaml
diff --git a/platform/ext/target/arm/rss/common/bl1/scripts/include/program3_cmd2.yaml b/platform/ext/target/arm/rse/common/bl1/scripts/include/program3_cmd2.yaml
similarity index 100%
rename from platform/ext/target/arm/rss/common/bl1/scripts/include/program3_cmd2.yaml
rename to platform/ext/target/arm/rse/common/bl1/scripts/include/program3_cmd2.yaml
diff --git a/platform/ext/target/arm/rss/common/bl1/scripts/include/program4_cmd0.yaml b/platform/ext/target/arm/rse/common/bl1/scripts/include/program4_cmd0.yaml
similarity index 100%
rename from platform/ext/target/arm/rss/common/bl1/scripts/include/program4_cmd0.yaml
rename to platform/ext/target/arm/rse/common/bl1/scripts/include/program4_cmd0.yaml
diff --git a/platform/ext/target/arm/rss/common/bl1/scripts/include/program4_cmd1.yaml b/platform/ext/target/arm/rse/common/bl1/scripts/include/program4_cmd1.yaml
similarity index 100%
rename from platform/ext/target/arm/rss/common/bl1/scripts/include/program4_cmd1.yaml
rename to platform/ext/target/arm/rse/common/bl1/scripts/include/program4_cmd1.yaml
diff --git a/platform/ext/target/arm/rss/common/bl1/scripts/include/program4_cmd2.yaml b/platform/ext/target/arm/rse/common/bl1/scripts/include/program4_cmd2.yaml
similarity index 100%
rename from platform/ext/target/arm/rss/common/bl1/scripts/include/program4_cmd2.yaml
rename to platform/ext/target/arm/rse/common/bl1/scripts/include/program4_cmd2.yaml
diff --git a/platform/ext/target/arm/rss/common/bl1/scripts/include/program4_cmd3.yaml b/platform/ext/target/arm/rse/common/bl1/scripts/include/program4_cmd3.yaml
similarity index 100%
rename from platform/ext/target/arm/rss/common/bl1/scripts/include/program4_cmd3.yaml
rename to platform/ext/target/arm/rse/common/bl1/scripts/include/program4_cmd3.yaml
diff --git a/platform/ext/target/arm/rss/common/bl1/scripts/include/program4_cmd4.yaml b/platform/ext/target/arm/rse/common/bl1/scripts/include/program4_cmd4.yaml
similarity index 100%
rename from platform/ext/target/arm/rss/common/bl1/scripts/include/program4_cmd4.yaml
rename to platform/ext/target/arm/rse/common/bl1/scripts/include/program4_cmd4.yaml
diff --git a/platform/ext/target/arm/rss/common/bl1/scripts/include/program5_cmd0.yaml b/platform/ext/target/arm/rse/common/bl1/scripts/include/program5_cmd0.yaml
similarity index 100%
rename from platform/ext/target/arm/rss/common/bl1/scripts/include/program5_cmd0.yaml
rename to platform/ext/target/arm/rse/common/bl1/scripts/include/program5_cmd0.yaml
diff --git a/platform/ext/target/arm/rss/common/bl1/scripts/include/program5_cmd1.yaml b/platform/ext/target/arm/rse/common/bl1/scripts/include/program5_cmd1.yaml
similarity index 100%
rename from platform/ext/target/arm/rss/common/bl1/scripts/include/program5_cmd1.yaml
rename to platform/ext/target/arm/rse/common/bl1/scripts/include/program5_cmd1.yaml
diff --git a/platform/ext/target/arm/rss/common/bl1/scripts/include/program5_cmd2.yaml b/platform/ext/target/arm/rse/common/bl1/scripts/include/program5_cmd2.yaml
similarity index 100%
rename from platform/ext/target/arm/rss/common/bl1/scripts/include/program5_cmd2.yaml
rename to platform/ext/target/arm/rse/common/bl1/scripts/include/program5_cmd2.yaml
diff --git a/platform/ext/target/arm/rss/common/bl1/scripts/include/program6_cmd0.yaml b/platform/ext/target/arm/rse/common/bl1/scripts/include/program6_cmd0.yaml
similarity index 100%
rename from platform/ext/target/arm/rss/common/bl1/scripts/include/program6_cmd0.yaml
rename to platform/ext/target/arm/rse/common/bl1/scripts/include/program6_cmd0.yaml
diff --git a/platform/ext/target/arm/rss/common/bl1/scripts/include/program6_cmd1.yaml b/platform/ext/target/arm/rse/common/bl1/scripts/include/program6_cmd1.yaml
similarity index 100%
rename from platform/ext/target/arm/rss/common/bl1/scripts/include/program6_cmd1.yaml
rename to platform/ext/target/arm/rse/common/bl1/scripts/include/program6_cmd1.yaml
diff --git a/platform/ext/target/arm/rss/common/bl1/scripts/include/program6_cmd2.yaml b/platform/ext/target/arm/rse/common/bl1/scripts/include/program6_cmd2.yaml
similarity index 100%
rename from platform/ext/target/arm/rss/common/bl1/scripts/include/program6_cmd2.yaml
rename to platform/ext/target/arm/rse/common/bl1/scripts/include/program6_cmd2.yaml
diff --git a/platform/ext/target/arm/rss/common/bl1/scripts/include/program6_cmd3.yaml b/platform/ext/target/arm/rse/common/bl1/scripts/include/program6_cmd3.yaml
similarity index 100%
rename from platform/ext/target/arm/rss/common/bl1/scripts/include/program6_cmd3.yaml
rename to platform/ext/target/arm/rse/common/bl1/scripts/include/program6_cmd3.yaml
diff --git a/platform/ext/target/arm/rss/common/bl1/scripts/include/program6_cmd4.yaml b/platform/ext/target/arm/rse/common/bl1/scripts/include/program6_cmd4.yaml
similarity index 100%
rename from platform/ext/target/arm/rss/common/bl1/scripts/include/program6_cmd4.yaml
rename to platform/ext/target/arm/rse/common/bl1/scripts/include/program6_cmd4.yaml
diff --git a/platform/ext/target/arm/rss/common/bl1/scripts/include/program6_cmd5.yaml b/platform/ext/target/arm/rse/common/bl1/scripts/include/program6_cmd5.yaml
similarity index 100%
rename from platform/ext/target/arm/rss/common/bl1/scripts/include/program6_cmd5.yaml
rename to platform/ext/target/arm/rse/common/bl1/scripts/include/program6_cmd5.yaml
diff --git a/platform/ext/target/arm/rss/common/bl1/scripts/include/program6_cmd6.yaml b/platform/ext/target/arm/rse/common/bl1/scripts/include/program6_cmd6.yaml
similarity index 100%
rename from platform/ext/target/arm/rss/common/bl1/scripts/include/program6_cmd6.yaml
rename to platform/ext/target/arm/rse/common/bl1/scripts/include/program6_cmd6.yaml
diff --git a/platform/ext/target/arm/rss/common/bl1/scripts/include/program6_cmd7.yaml b/platform/ext/target/arm/rse/common/bl1/scripts/include/program6_cmd7.yaml
similarity index 100%
rename from platform/ext/target/arm/rss/common/bl1/scripts/include/program6_cmd7.yaml
rename to platform/ext/target/arm/rse/common/bl1/scripts/include/program6_cmd7.yaml
diff --git a/platform/ext/target/arm/rss/common/bl1/scripts/include/program6_cmd8.yaml b/platform/ext/target/arm/rse/common/bl1/scripts/include/program6_cmd8.yaml
similarity index 100%
rename from platform/ext/target/arm/rss/common/bl1/scripts/include/program6_cmd8.yaml
rename to platform/ext/target/arm/rse/common/bl1/scripts/include/program6_cmd8.yaml
diff --git a/platform/ext/target/arm/rss/common/bl2/boot_dma.c b/platform/ext/target/arm/rse/common/bl2/boot_dma.c
similarity index 100%
rename from platform/ext/target/arm/rss/common/bl2/boot_dma.c
rename to platform/ext/target/arm/rse/common/bl2/boot_dma.c
diff --git a/platform/ext/target/arm/rss/common/bl2/boot_dma.h b/platform/ext/target/arm/rse/common/bl2/boot_dma.h
similarity index 100%
rename from platform/ext/target/arm/rss/common/bl2/boot_dma.h
rename to platform/ext/target/arm/rse/common/bl2/boot_dma.h
diff --git a/platform/ext/target/arm/rss/common/bl2/create_xip_tables.py b/platform/ext/target/arm/rse/common/bl2/create_xip_tables.py
similarity index 100%
rename from platform/ext/target/arm/rss/common/bl2/create_xip_tables.py
rename to platform/ext/target/arm/rse/common/bl2/create_xip_tables.py
diff --git a/platform/ext/target/arm/rss/common/bl2/sic_boot.c b/platform/ext/target/arm/rse/common/bl2/sic_boot.c
similarity index 99%
rename from platform/ext/target/arm/rss/common/bl2/sic_boot.c
rename to platform/ext/target/arm/rse/common/bl2/sic_boot.c
index deb9997..1c4cd36 100644
--- a/platform/ext/target/arm/rss/common/bl2/sic_boot.c
+++ b/platform/ext/target/arm/rse/common/bl2/sic_boot.c
@@ -13,7 +13,7 @@
 #include "tfm_plat_otp.h"
 #include "host_flash_atu.h"
 #include "plat_def_fip_uuid.h"
-#include "rss_kmu_slot_ids.h"
+#include "rse_kmu_slot_ids.h"
 
 #include <string.h>
 
diff --git a/platform/ext/target/arm/rss/common/bl2/sic_boot.h b/platform/ext/target/arm/rse/common/bl2/sic_boot.h
similarity index 100%
rename from platform/ext/target/arm/rss/common/bl2/sic_boot.h
rename to platform/ext/target/arm/rse/common/bl2/sic_boot.h
diff --git a/platform/ext/target/arm/rss/common/bl2/signing_layout_sic_tables.c.in b/platform/ext/target/arm/rse/common/bl2/signing_layout_sic_tables.c.in
similarity index 100%
rename from platform/ext/target/arm/rss/common/bl2/signing_layout_sic_tables.c.in
rename to platform/ext/target/arm/rse/common/bl2/signing_layout_sic_tables.c.in
diff --git a/platform/ext/target/arm/rss/common/bringup_helpers/rss_bl1_2_image_otp_or_flash.c b/platform/ext/target/arm/rse/common/bringup_helpers/rse_bl1_2_image_otp_or_flash.c
similarity index 100%
rename from platform/ext/target/arm/rss/common/bringup_helpers/rss_bl1_2_image_otp_or_flash.c
rename to platform/ext/target/arm/rse/common/bringup_helpers/rse_bl1_2_image_otp_or_flash.c
diff --git a/platform/ext/target/arm/rss/common/bringup_helpers/rss_bringup_helpers.c b/platform/ext/target/arm/rse/common/bringup_helpers/rse_bringup_helpers.c
similarity index 96%
rename from platform/ext/target/arm/rss/common/bringup_helpers/rss_bringup_helpers.c
rename to platform/ext/target/arm/rse/common/bringup_helpers/rse_bringup_helpers.c
index 1bdc15c..e5e5e2e 100644
--- a/platform/ext/target/arm/rss/common/bringup_helpers/rss_bringup_helpers.c
+++ b/platform/ext/target/arm/rse/common/bringup_helpers/rse_bringup_helpers.c
@@ -6,9 +6,9 @@
  */
 
 
-#include "rss_bringup_helpers.h"
+#include "rse_bringup_helpers.h"
 
-#include "rss_bringup_helpers_hal.h"
+#include "rse_bringup_helpers_hal.h"
 #include "platform_base_address.h"
 #include "boot_hal.h"
 #include "flash_layout.h"
diff --git a/platform/ext/target/arm/rss/common/bringup_helpers/rss_bringup_helpers.h b/platform/ext/target/arm/rse/common/bringup_helpers/rse_bringup_helpers.h
similarity index 87%
rename from platform/ext/target/arm/rss/common/bringup_helpers/rss_bringup_helpers.h
rename to platform/ext/target/arm/rse/common/bringup_helpers/rse_bringup_helpers.h
index c9461ac..885eaa2 100644
--- a/platform/ext/target/arm/rss/common/bringup_helpers/rss_bringup_helpers.h
+++ b/platform/ext/target/arm/rse/common/bringup_helpers/rse_bringup_helpers.h
@@ -5,8 +5,8 @@
  *
  */
 
-#ifndef __RSS_BRINGUP_HELPERS_H__
-#define __RSS_BRINGUP_HELPERS_H__
+#ifndef __RSE_BRINGUP_HELPERS_H__
+#define __RSE_BRINGUP_HELPERS_H__
 
 #ifdef __cplusplus
 extern "C" {
@@ -28,5 +28,4 @@
 }
 #endif
 
-#endif /* __RSS_BRINGUP_HELPERS_H__ */
-
+#endif /* __RSE_BRINGUP_HELPERS_H__ */
diff --git a/platform/ext/target/arm/rss/common/bringup_helpers/rss_bringup_helpers_hal.h b/platform/ext/target/arm/rse/common/bringup_helpers/rse_bringup_helpers_hal.h
similarity index 79%
rename from platform/ext/target/arm/rss/common/bringup_helpers/rss_bringup_helpers_hal.h
rename to platform/ext/target/arm/rse/common/bringup_helpers/rse_bringup_helpers_hal.h
index 0bb1ec2..71ea2f8 100644
--- a/platform/ext/target/arm/rss/common/bringup_helpers/rss_bringup_helpers_hal.h
+++ b/platform/ext/target/arm/rse/common/bringup_helpers/rse_bringup_helpers_hal.h
@@ -5,8 +5,8 @@
  *
  */
 
-#ifndef __RSS_BRINGUP_HELPERS_HAL_H__
-#define __RSS_BRINGUP_HELPERS_HAL_H__
+#ifndef __RSE_BRINGUP_HELPERS_HAL_H__
+#define __RSE_BRINGUP_HELPERS_HAL_H__
 
 #include <stdint.h>
 #include <stddef.h>
@@ -25,4 +25,4 @@
 }
 #endif
 
-#endif /* __RSS_BRINGUP_HELPERS_HAL_H__ */
+#endif /* __RSE_BRINGUP_HELPERS_HAL_H__ */
diff --git a/platform/ext/target/arm/rss/common/bringup_helpers/rss_otp_emulation.h b/platform/ext/target/arm/rse/common/bringup_helpers/rse_otp_emulation.h
similarity index 70%
rename from platform/ext/target/arm/rss/common/bringup_helpers/rss_otp_emulation.h
rename to platform/ext/target/arm/rse/common/bringup_helpers/rse_otp_emulation.h
index 673d3f6..33eb0e1 100644
--- a/platform/ext/target/arm/rss/common/bringup_helpers/rss_otp_emulation.h
+++ b/platform/ext/target/arm/rse/common/bringup_helpers/rse_otp_emulation.h
@@ -5,8 +5,8 @@
  *
  */
 
-#ifndef __RSS_OTP_EMULATION_H__
-#define __RSS_OTP_EMULATION_H__
+#ifndef __RSE_OTP_EMULATION_H__
+#define __RSE_OTP_EMULATION_H__
 
 #include <stdbool.h>
 
@@ -20,4 +20,4 @@
 }
 #endif
 
-#endif /* __RSS_OTP_EMULATION_H__ */
+#endif /* __RSE_OTP_EMULATION_H__ */
diff --git a/platform/ext/target/arm/rss/common/cc312/cc3xx_aes_external_key_loader.c b/platform/ext/target/arm/rse/common/cc312/cc3xx_aes_external_key_loader.c
similarity index 100%
rename from platform/ext/target/arm/rss/common/cc312/cc3xx_aes_external_key_loader.c
rename to platform/ext/target/arm/rse/common/cc312/cc3xx_aes_external_key_loader.c
diff --git a/platform/ext/target/arm/rss/common/cc312/cc3xx_aes_external_key_loader.h b/platform/ext/target/arm/rse/common/cc312/cc3xx_aes_external_key_loader.h
similarity index 100%
rename from platform/ext/target/arm/rss/common/cc312/cc3xx_aes_external_key_loader.h
rename to platform/ext/target/arm/rse/common/cc312/cc3xx_aes_external_key_loader.h
diff --git a/platform/ext/target/arm/rss/common/cc312/cc3xx_config.h b/platform/ext/target/arm/rse/common/cc312/cc3xx_config.h
similarity index 100%
rename from platform/ext/target/arm/rss/common/cc312/cc3xx_config.h
rename to platform/ext/target/arm/rse/common/cc312/cc3xx_config.h
diff --git a/platform/ext/target/arm/rss/common/cc312/cc3xx_rng_external_trng.h b/platform/ext/target/arm/rse/common/cc312/cc3xx_rng_external_trng.h
similarity index 100%
rename from platform/ext/target/arm/rss/common/cc312/cc3xx_rng_external_trng.h
rename to platform/ext/target/arm/rse/common/cc312/cc3xx_rng_external_trng.h
diff --git a/platform/ext/target/arm/rss/common/cc312/dx_reg_base_host.h b/platform/ext/target/arm/rse/common/cc312/dx_reg_base_host.h
similarity index 73%
rename from platform/ext/target/arm/rss/common/cc312/dx_reg_base_host.h
rename to platform/ext/target/arm/rse/common/cc312/dx_reg_base_host.h
index 2e17eb5..d0a9efe 100644
--- a/platform/ext/target/arm/rss/common/cc312/dx_reg_base_host.h
+++ b/platform/ext/target/arm/rse/common/cc312/dx_reg_base_host.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef __DX_REG_BASE_RSS_H__
-#define __DX_REG_BASE_RSS_H__
+#ifndef __DX_REG_BASE_RSE_H__
+#define __DX_REG_BASE_RSE_H__
 
 #define DX_BASE_CC          0x50154000
 
@@ -14,4 +14,4 @@
 
 #define DX_BASE_RNG         0x0000UL
 
-#endif /* __DX_REG_BASE_RSS_H__ */
+#endif /* __DX_REG_BASE_RSE_H__ */
diff --git a/platform/ext/target/arm/rss/common/check_config.cmake b/platform/ext/target/arm/rse/common/check_config.cmake
similarity index 100%
rename from platform/ext/target/arm/rss/common/check_config.cmake
rename to platform/ext/target/arm/rse/common/check_config.cmake
diff --git a/platform/ext/target/arm/rss/common/cmsis_drivers/Driver_MPC.c b/platform/ext/target/arm/rse/common/cmsis_drivers/Driver_MPC.c
similarity index 100%
rename from platform/ext/target/arm/rss/common/cmsis_drivers/Driver_MPC.c
rename to platform/ext/target/arm/rse/common/cmsis_drivers/Driver_MPC.c
diff --git a/platform/ext/target/arm/rss/common/cmsis_drivers/Driver_PPC.c b/platform/ext/target/arm/rse/common/cmsis_drivers/Driver_PPC.c
similarity index 99%
rename from platform/ext/target/arm/rss/common/cmsis_drivers/Driver_PPC.c
rename to platform/ext/target/arm/rse/common/cmsis_drivers/Driver_PPC.c
index c7db3f8..acd76a0 100644
--- a/platform/ext/target/arm/rss/common/cmsis_drivers/Driver_PPC.c
+++ b/platform/ext/target/arm/rse/common/cmsis_drivers/Driver_PPC.c
@@ -20,7 +20,7 @@
 #include "cmsis.h"
 #include "cmsis_driver_config.h"
 #include "RTE_Device.h"
-#include "ppc_rss_drv.h"
+#include "ppc_rse_drv.h"
 
 /* Driver version */
 #define ARM_PPC_DRV_VERSION ARM_DRIVER_VERSION_MAJOR_MINOR(1,0)
diff --git a/platform/ext/target/arm/rss/common/cmsis_drivers/Driver_PPC.h b/platform/ext/target/arm/rse/common/cmsis_drivers/Driver_PPC.h
similarity index 98%
rename from platform/ext/target/arm/rss/common/cmsis_drivers/Driver_PPC.h
rename to platform/ext/target/arm/rse/common/cmsis_drivers/Driver_PPC.h
index bb02d95..a569b60 100644
--- a/platform/ext/target/arm/rss/common/cmsis_drivers/Driver_PPC.h
+++ b/platform/ext/target/arm/rse/common/cmsis_drivers/Driver_PPC.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef __PPC_RSS_DRIVER_H__
-#define __PPC_RSS_DRIVER_H__
+#ifndef __PPC_RSE_DRIVER_H__
+#define __PPC_RSE_DRIVER_H__
 
 #include "Driver_Common.h"
 
@@ -128,4 +128,4 @@
 #ifdef __cplusplus
 }
 #endif
-#endif /* __PPC_RSS_DRIVER_H__ */
+#endif /* __PPC_RSE_DRIVER_H__ */
diff --git a/platform/ext/target/arm/rss/common/cmsis_drivers/Driver_USART_cmsdk.c b/platform/ext/target/arm/rse/common/cmsis_drivers/Driver_USART_cmsdk.c
similarity index 100%
rename from platform/ext/target/arm/rss/common/cmsis_drivers/Driver_USART_cmsdk.c
rename to platform/ext/target/arm/rse/common/cmsis_drivers/Driver_USART_cmsdk.c
diff --git a/platform/ext/target/arm/rss/common/cmsis_drivers/config/RTE_Device.h b/platform/ext/target/arm/rse/common/cmsis_drivers/config/RTE_Device.h
similarity index 100%
rename from platform/ext/target/arm/rss/common/cmsis_drivers/config/RTE_Device.h
rename to platform/ext/target/arm/rse/common/cmsis_drivers/config/RTE_Device.h
diff --git a/platform/ext/target/arm/rss/common/cmsis_drivers/config/cmsis_driver_config.h b/platform/ext/target/arm/rse/common/cmsis_drivers/config/cmsis_driver_config.h
similarity index 97%
rename from platform/ext/target/arm/rss/common/cmsis_drivers/config/cmsis_driver_config.h
rename to platform/ext/target/arm/rse/common/cmsis_drivers/config/cmsis_driver_config.h
index 5effacb..39e6500 100644
--- a/platform/ext/target/arm/rss/common/cmsis_drivers/config/cmsis_driver_config.h
+++ b/platform/ext/target/arm/rse/common/cmsis_drivers/config/cmsis_driver_config.h
@@ -22,7 +22,7 @@
 #include "RTE_Device.h"
 #include "host_cmsis_driver_config.h"
 #ifdef RSS_HAS_EXPANSION_PERIPHERALS
-#include "rss_expansion_cmsis_driver_config.h"
+#include "rse_expansion_cmsis_driver_config.h"
 #endif /* RSS_HAS_EXPANSION_PERIPHERALS */
 
 
diff --git a/platform/ext/target/arm/rss/common/config.cmake b/platform/ext/target/arm/rse/common/config.cmake
similarity index 100%
rename from platform/ext/target/arm/rss/common/config.cmake
rename to platform/ext/target/arm/rse/common/config.cmake
diff --git a/platform/ext/target/arm/rss/common/cpak_generator/CMakeLists.txt b/platform/ext/target/arm/rse/common/cpak_generator/CMakeLists.txt
similarity index 100%
rename from platform/ext/target/arm/rss/common/cpak_generator/CMakeLists.txt
rename to platform/ext/target/arm/rse/common/cpak_generator/CMakeLists.txt
diff --git a/platform/ext/target/arm/rss/common/cpak_generator/bin_to_pem.py b/platform/ext/target/arm/rse/common/cpak_generator/bin_to_pem.py
similarity index 100%
rename from platform/ext/target/arm/rss/common/cpak_generator/bin_to_pem.py
rename to platform/ext/target/arm/rse/common/cpak_generator/bin_to_pem.py
diff --git a/platform/ext/target/arm/rss/common/cpak_generator/cpak_generator.c b/platform/ext/target/arm/rse/common/cpak_generator/cpak_generator.c
similarity index 100%
rename from platform/ext/target/arm/rss/common/cpak_generator/cpak_generator.c
rename to platform/ext/target/arm/rse/common/cpak_generator/cpak_generator.c
diff --git a/platform/ext/target/arm/rss/common/cpuarch.cmake b/platform/ext/target/arm/rse/common/cpuarch.cmake
similarity index 100%
rename from platform/ext/target/arm/rss/common/cpuarch.cmake
rename to platform/ext/target/arm/rse/common/cpuarch.cmake
diff --git a/platform/ext/target/arm/rss/common/crypto_keys.c b/platform/ext/target/arm/rse/common/crypto_keys.c
similarity index 100%
rename from platform/ext/target/arm/rss/common/crypto_keys.c
rename to platform/ext/target/arm/rse/common/crypto_keys.c
diff --git a/platform/ext/target/arm/rss/common/device/config/device_cfg.h b/platform/ext/target/arm/rse/common/device/config/device_cfg.h
similarity index 98%
rename from platform/ext/target/arm/rss/common/device/config/device_cfg.h
rename to platform/ext/target/arm/rse/common/device/config/device_cfg.h
index ce5ac20..88bf701 100644
--- a/platform/ext/target/arm/rss/common/device/config/device_cfg.h
+++ b/platform/ext/target/arm/rse/common/device/config/device_cfg.h
@@ -26,7 +26,7 @@
 
 #include "host_device_cfg.h"
 #ifdef RSS_HAS_EXPANSION_PERIPHERALS
-#include "rss_expansion_device_cfg.h"
+#include "rse_expansion_device_cfg.h"
 #endif /* RSS_HAS_EXPANSION_PERIPHERALS */
 
 #ifdef RSS_DEBUG_UART
diff --git a/platform/ext/target/arm/rss/common/device/config/device_cfg_ns.h b/platform/ext/target/arm/rse/common/device/config/device_cfg_ns.h
similarity index 96%
rename from platform/ext/target/arm/rss/common/device/config/device_cfg_ns.h
rename to platform/ext/target/arm/rse/common/device/config/device_cfg_ns.h
index dd5bd72..cde31ea 100644
--- a/platform/ext/target/arm/rss/common/device/config/device_cfg_ns.h
+++ b/platform/ext/target/arm/rse/common/device/config/device_cfg_ns.h
@@ -28,7 +28,7 @@
 
 #include "host_device_cfg.h"
 #ifdef RSS_HAS_EXPANSION_PERIPHERALS
-#include "rss_expansion_device_cfg.h"
+#include "rse_expansion_device_cfg.h"
 #endif /* RSS_HAS_EXPANSION_PERIPHERALS */
 
 #ifdef RSS_DEBUG_UART
diff --git a/platform/ext/target/arm/rss/common/device/include/boot_measurement.h b/platform/ext/target/arm/rse/common/device/include/boot_measurement.h
similarity index 100%
rename from platform/ext/target/arm/rss/common/device/include/boot_measurement.h
rename to platform/ext/target/arm/rse/common/device/include/boot_measurement.h
diff --git a/platform/ext/target/arm/rss/common/device/include/cmsis.h b/platform/ext/target/arm/rse/common/device/include/cmsis.h
similarity index 97%
rename from platform/ext/target/arm/rss/common/device/include/cmsis.h
rename to platform/ext/target/arm/rse/common/device/include/cmsis.h
index cfcfa8d..b4b24b5 100644
--- a/platform/ext/target/arm/rss/common/device/include/cmsis.h
+++ b/platform/ext/target/arm/rse/common/device/include/cmsis.h
@@ -17,6 +17,6 @@
 #ifndef __CMSIS_H__
 #define __CMSIS_H__
 
-#include "rss.h"
+#include "rse.h"
 
 #endif  /* __CMSIS_H__ */
diff --git a/platform/ext/target/arm/rss/common/device/include/device_definition.h b/platform/ext/target/arm/rse/common/device/include/device_definition.h
similarity index 94%
rename from platform/ext/target/arm/rss/common/device/include/device_definition.h
rename to platform/ext/target/arm/rse/common/device/include/device_definition.h
index 1b911df..fe30138 100644
--- a/platform/ext/target/arm/rss/common/device/include/device_definition.h
+++ b/platform/ext/target/arm/rse/common/device/include/device_definition.h
@@ -29,7 +29,7 @@
 #include "device_cfg.h"
 #include "host_device_definition.h"
 #ifdef RSS_HAS_EXPANSION_PERIPHERALS
-#include "rss_expansion_device_definition.h"
+#include "rse_expansion_device_definition.h"
 #endif /* RSS_HAS_EXPANSION_PERIPHERALS */
 
 #ifdef __cplusplus
@@ -39,7 +39,7 @@
 /* ======= Defines peripheral configuration structures ======= */
 /* ATU driver structures */
 #ifdef ATU_S
-#include "atu_rss_drv.h"
+#include "atu_rse_drv.h"
 extern struct atu_dev_t ATU_DEV_S;
 #endif
 
@@ -67,57 +67,57 @@
 
 /* ARM PPC driver structures */
 #ifdef PPC_RSS_MAIN0_S
-#include "ppc_rss_drv.h"
+#include "ppc_rse_drv.h"
 extern struct ppc_rss_dev_t PPC_RSS_MAIN0_DEV_S;
 #endif
 
 #ifdef PPC_RSS_MAIN_EXP0_S
-#include "ppc_rss_drv.h"
+#include "ppc_rse_drv.h"
 extern struct ppc_rss_dev_t PPC_RSS_MAIN_EXP0_DEV_S;
 #endif
 
 #ifdef PPC_RSS_MAIN_EXP1_S
-#include "ppc_rss_drv.h"
+#include "ppc_rse_drv.h"
 extern struct ppc_rss_dev_t PPC_RSS_MAIN_EXP1_DEV_S;
 #endif
 
 #ifdef PPC_RSS_MAIN_EXP2_S
-#include "ppc_rss_drv.h"
+#include "ppc_rse_drv.h"
 extern struct ppc_rss_dev_t PPC_RSS_MAIN_EXP2_DEV_S;
 #endif
 
 #ifdef PPC_RSS_MAIN_EXP3_S
-#include "ppc_rss_drv.h"
+#include "ppc_rse_drv.h"
 extern struct ppc_rss_dev_t PPC_RSS_MAIN_EXP3_DEV_S;
 #endif
 
 #ifdef PPC_RSS_PERIPH0_S
-#include "ppc_rss_drv.h"
+#include "ppc_rse_drv.h"
 extern struct ppc_rss_dev_t PPC_RSS_PERIPH0_DEV_S;
 #endif
 
 #ifdef PPC_RSS_PERIPH1_S
-#include "ppc_rss_drv.h"
+#include "ppc_rse_drv.h"
 extern struct ppc_rss_dev_t PPC_RSS_PERIPH1_DEV_S;
 #endif
 
 #ifdef PPC_RSS_PERIPH_EXP0_S
-#include "ppc_rss_drv.h"
+#include "ppc_rse_drv.h"
 extern struct ppc_rss_dev_t PPC_RSS_PERIPH_EXP0_DEV_S;
 #endif
 
 #ifdef PPC_RSS_PERIPH_EXP1_S
-#include "ppc_rss_drv.h"
+#include "ppc_rse_drv.h"
 extern struct ppc_rss_dev_t PPC_RSS_PERIPH_EXP1_DEV_S;
 #endif
 
 #ifdef PPC_RSS_PERIPH_EXP2_S
-#include "ppc_rss_drv.h"
+#include "ppc_rse_drv.h"
 extern struct ppc_rss_dev_t PPC_RSS_PERIPH_EXP2_DEV_S;
 #endif
 
 #ifdef PPC_RSS_PERIPH_EXP3_S
-#include "ppc_rss_drv.h"
+#include "ppc_rse_drv.h"
 extern struct ppc_rss_dev_t PPC_RSS_PERIPH_EXP3_DEV_S;
 #endif
 
diff --git a/platform/ext/target/arm/rss/common/device/include/platform_irq.h b/platform/ext/target/arm/rse/common/device/include/platform_irq.h
similarity index 100%
rename from platform/ext/target/arm/rss/common/device/include/platform_irq.h
rename to platform/ext/target/arm/rse/common/device/include/platform_irq.h
diff --git a/platform/ext/target/arm/rss/common/device/include/platform_pins.h b/platform/ext/target/arm/rse/common/device/include/platform_pins.h
similarity index 100%
rename from platform/ext/target/arm/rss/common/device/include/platform_pins.h
rename to platform/ext/target/arm/rse/common/device/include/platform_pins.h
diff --git a/platform/ext/target/arm/rss/common/device/include/platform_regs.h b/platform/ext/target/arm/rse/common/device/include/platform_regs.h
similarity index 100%
rename from platform/ext/target/arm/rss/common/device/include/platform_regs.h
rename to platform/ext/target/arm/rse/common/device/include/platform_regs.h
diff --git a/platform/ext/target/arm/rss/common/device/include/rss.h b/platform/ext/target/arm/rse/common/device/include/rse.h
similarity index 97%
rename from platform/ext/target/arm/rss/common/device/include/rss.h
rename to platform/ext/target/arm/rse/common/device/include/rse.h
index 5c14910..163995fd 100644
--- a/platform/ext/target/arm/rss/common/device/include/rss.h
+++ b/platform/ext/target/arm/rse/common/device/include/rse.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef __RSS_H__
-#define __RSS_H__
+#ifndef __RSE_H__
+#define __RSE_H__
 
 #ifdef __cplusplus
 extern "C" {
@@ -89,4 +89,4 @@
 }
 #endif
 
-#endif /* __RSS_H__ */
+#endif /* __RSE_H__ */
diff --git a/platform/ext/target/arm/rss/common/device/include/system_core_init.h b/platform/ext/target/arm/rse/common/device/include/system_core_init.h
similarity index 100%
rename from platform/ext/target/arm/rss/common/device/include/system_core_init.h
rename to platform/ext/target/arm/rse/common/device/include/system_core_init.h
diff --git a/platform/ext/target/arm/rss/common/device/source/armclang/rss_bl1_1.sct b/platform/ext/target/arm/rse/common/device/source/armclang/rse_bl1_1.sct
similarity index 100%
rename from platform/ext/target/arm/rss/common/device/source/armclang/rss_bl1_1.sct
rename to platform/ext/target/arm/rse/common/device/source/armclang/rse_bl1_1.sct
diff --git a/platform/ext/target/arm/rss/common/device/source/armclang/rss_bl1_2.sct b/platform/ext/target/arm/rse/common/device/source/armclang/rse_bl1_2.sct
similarity index 100%
rename from platform/ext/target/arm/rss/common/device/source/armclang/rss_bl1_2.sct
rename to platform/ext/target/arm/rse/common/device/source/armclang/rse_bl1_2.sct
diff --git a/platform/ext/target/arm/rss/common/device/source/device_definition.c b/platform/ext/target/arm/rse/common/device/source/device_definition.c
similarity index 100%
rename from platform/ext/target/arm/rss/common/device/source/device_definition.c
rename to platform/ext/target/arm/rse/common/device/source/device_definition.c
diff --git a/platform/ext/target/arm/rss/common/device/source/dma350_checker_device_defs.c b/platform/ext/target/arm/rse/common/device/source/dma350_checker_device_defs.c
similarity index 100%
rename from platform/ext/target/arm/rss/common/device/source/dma350_checker_device_defs.c
rename to platform/ext/target/arm/rse/common/device/source/dma350_checker_device_defs.c
diff --git a/platform/ext/target/arm/rss/common/device/source/gcc/rss_bl1_1.ld b/platform/ext/target/arm/rse/common/device/source/gcc/rse_bl1_1.ld
similarity index 100%
rename from platform/ext/target/arm/rss/common/device/source/gcc/rss_bl1_1.ld
rename to platform/ext/target/arm/rse/common/device/source/gcc/rse_bl1_1.ld
diff --git a/platform/ext/target/arm/rss/common/device/source/gcc/rss_bl1_2.ld b/platform/ext/target/arm/rse/common/device/source/gcc/rse_bl1_2.ld
similarity index 100%
rename from platform/ext/target/arm/rss/common/device/source/gcc/rss_bl1_2.ld
rename to platform/ext/target/arm/rse/common/device/source/gcc/rse_bl1_2.ld
diff --git a/platform/ext/target/arm/rss/common/device/source/startup_rss.c b/platform/ext/target/arm/rse/common/device/source/startup_rse.c
similarity index 100%
rename from platform/ext/target/arm/rss/common/device/source/startup_rss.c
rename to platform/ext/target/arm/rse/common/device/source/startup_rse.c
diff --git a/platform/ext/target/arm/rss/common/device/source/startup_rss_bl1_1.c b/platform/ext/target/arm/rse/common/device/source/startup_rse_bl1_1.c
similarity index 99%
rename from platform/ext/target/arm/rss/common/device/source/startup_rss_bl1_1.c
rename to platform/ext/target/arm/rse/common/device/source/startup_rse_bl1_1.c
index 86a8ac9..59cdc74 100644
--- a/platform/ext/target/arm/rss/common/device/source/startup_rss_bl1_1.c
+++ b/platform/ext/target/arm/rse/common/device/source/startup_rse_bl1_1.c
@@ -25,7 +25,7 @@
 
 #include "device_definition.h"
 #include "region_defs.h"
-#include "rss_kmu_slot_ids.h"
+#include "rse_kmu_slot_ids.h"
 
 /*----------------------------------------------------------------------------
   External References
diff --git a/platform/ext/target/arm/rss/common/device/source/system_core_init.c b/platform/ext/target/arm/rse/common/device/source/system_core_init.c
similarity index 100%
rename from platform/ext/target/arm/rss/common/device/source/system_core_init.c
rename to platform/ext/target/arm/rse/common/device/source/system_core_init.c
diff --git a/platform/ext/target/arm/rss/common/dma350_privileged_config.c b/platform/ext/target/arm/rse/common/dma350_privileged_config.c
similarity index 100%
rename from platform/ext/target/arm/rss/common/dma350_privileged_config.c
rename to platform/ext/target/arm/rse/common/dma350_privileged_config.c
diff --git a/platform/ext/target/arm/rss/common/dpa_hardened_word_copy.c b/platform/ext/target/arm/rse/common/dpa_hardened_word_copy.c
similarity index 100%
rename from platform/ext/target/arm/rss/common/dpa_hardened_word_copy.c
rename to platform/ext/target/arm/rse/common/dpa_hardened_word_copy.c
diff --git a/platform/ext/target/arm/rss/common/dpa_hardened_word_copy.h b/platform/ext/target/arm/rse/common/dpa_hardened_word_copy.h
similarity index 88%
rename from platform/ext/target/arm/rss/common/dpa_hardened_word_copy.h
rename to platform/ext/target/arm/rse/common/dpa_hardened_word_copy.h
index 5de7441..6fc5495 100644
--- a/platform/ext/target/arm/rss/common/dpa_hardened_word_copy.h
+++ b/platform/ext/target/arm/rse/common/dpa_hardened_word_copy.h
@@ -5,8 +5,8 @@
  *
  */
 
-#ifndef __RSS_SECURE_WORD_COPY_H__
-#define __RSS_SECURE_WORD_COPY_H__
+#ifndef __RSE_SECURE_WORD_COPY_H__
+#define __RSE_SECURE_WORD_COPY_H__
 
 #include <stdint.h>
 #include <stddef.h>
@@ -34,4 +34,4 @@
 }
 #endif
 
-#endif /* __RSS_SECURE_WORD_COPY_H__ */
+#endif /* __RSE_SECURE_WORD_COPY_H__ */
diff --git a/platform/ext/target/arm/rss/common/dpe/dpe_plat.c b/platform/ext/target/arm/rse/common/dpe/dpe_plat.c
similarity index 96%
rename from platform/ext/target/arm/rss/common/dpe/dpe_plat.c
rename to platform/ext/target/arm/rse/common/dpe/dpe_plat.c
index a6caa95..3ee81ad 100644
--- a/platform/ext/target/arm/rss/common/dpe/dpe_plat.c
+++ b/platform/ext/target/arm/rse/common/dpe/dpe_plat.c
@@ -7,7 +7,7 @@
 
 #include "dpe_plat.h"
 #include "device_definition.h"
-#include "rss_kmu_slot_ids.h"
+#include "rse_kmu_slot_ids.h"
 #include "tfm_crypto_defs.h"
 #include "tfm_plat_defs.h"
 
diff --git a/platform/ext/target/arm/rss/common/dpe/dpe_plat.h b/platform/ext/target/arm/rse/common/dpe/dpe_plat.h
similarity index 100%
rename from platform/ext/target/arm/rss/common/dpe/dpe_plat.h
rename to platform/ext/target/arm/rse/common/dpe/dpe_plat.h
diff --git a/platform/ext/target/arm/rss/common/faults.c b/platform/ext/target/arm/rse/common/faults.c
similarity index 100%
rename from platform/ext/target/arm/rss/common/faults.c
rename to platform/ext/target/arm/rse/common/faults.c
diff --git a/platform/ext/target/arm/rss/common/fip_parser/CMakeLists.txt b/platform/ext/target/arm/rse/common/fip_parser/CMakeLists.txt
similarity index 100%
rename from platform/ext/target/arm/rss/common/fip_parser/CMakeLists.txt
rename to platform/ext/target/arm/rse/common/fip_parser/CMakeLists.txt
diff --git a/platform/ext/target/arm/rss/common/fip_parser/fip_parser.c b/platform/ext/target/arm/rse/common/fip_parser/fip_parser.c
similarity index 100%
rename from platform/ext/target/arm/rss/common/fip_parser/fip_parser.c
rename to platform/ext/target/arm/rse/common/fip_parser/fip_parser.c
diff --git a/platform/ext/target/arm/rss/common/fip_parser/fip_parser.h b/platform/ext/target/arm/rse/common/fip_parser/fip_parser.h
similarity index 100%
rename from platform/ext/target/arm/rss/common/fip_parser/fip_parser.h
rename to platform/ext/target/arm/rse/common/fip_parser/fip_parser.h
diff --git a/platform/ext/target/arm/rss/common/fip_parser/firmware_image_package.h b/platform/ext/target/arm/rse/common/fip_parser/firmware_image_package.h
similarity index 100%
rename from platform/ext/target/arm/rss/common/fip_parser/firmware_image_package.h
rename to platform/ext/target/arm/rse/common/fip_parser/firmware_image_package.h
diff --git a/platform/ext/target/arm/rss/common/fip_parser/gpt.c b/platform/ext/target/arm/rse/common/fip_parser/gpt.c
similarity index 100%
rename from platform/ext/target/arm/rss/common/fip_parser/gpt.c
rename to platform/ext/target/arm/rse/common/fip_parser/gpt.c
diff --git a/platform/ext/target/arm/rss/common/fip_parser/gpt.h b/platform/ext/target/arm/rse/common/fip_parser/gpt.h
similarity index 100%
rename from platform/ext/target/arm/rss/common/fip_parser/gpt.h
rename to platform/ext/target/arm/rse/common/fip_parser/gpt.h
diff --git a/platform/ext/target/arm/rss/common/fip_parser/host_flash_atu.c b/platform/ext/target/arm/rse/common/fip_parser/host_flash_atu.c
similarity index 100%
rename from platform/ext/target/arm/rss/common/fip_parser/host_flash_atu.c
rename to platform/ext/target/arm/rse/common/fip_parser/host_flash_atu.c
diff --git a/platform/ext/target/arm/rss/common/fip_parser/host_flash_atu.h b/platform/ext/target/arm/rse/common/fip_parser/host_flash_atu.h
similarity index 100%
rename from platform/ext/target/arm/rss/common/fip_parser/host_flash_atu.h
rename to platform/ext/target/arm/rse/common/fip_parser/host_flash_atu.h
diff --git a/platform/ext/target/arm/rss/common/fip_parser/uuid.h b/platform/ext/target/arm/rse/common/fip_parser/uuid.h
similarity index 100%
rename from platform/ext/target/arm/rss/common/fip_parser/uuid.h
rename to platform/ext/target/arm/rse/common/fip_parser/uuid.h
diff --git a/platform/ext/target/arm/rss/common/host_drivers/ni_tower/apu/ni_tower_apu_drv.c b/platform/ext/target/arm/rse/common/host_drivers/ni_tower/apu/ni_tower_apu_drv.c
similarity index 100%
rename from platform/ext/target/arm/rss/common/host_drivers/ni_tower/apu/ni_tower_apu_drv.c
rename to platform/ext/target/arm/rse/common/host_drivers/ni_tower/apu/ni_tower_apu_drv.c
diff --git a/platform/ext/target/arm/rss/common/host_drivers/ni_tower/apu/ni_tower_apu_drv.h b/platform/ext/target/arm/rse/common/host_drivers/ni_tower/apu/ni_tower_apu_drv.h
similarity index 100%
rename from platform/ext/target/arm/rss/common/host_drivers/ni_tower/apu/ni_tower_apu_drv.h
rename to platform/ext/target/arm/rse/common/host_drivers/ni_tower/apu/ni_tower_apu_drv.h
diff --git a/platform/ext/target/arm/rss/common/host_drivers/ni_tower/apu/ni_tower_apu_reg.h b/platform/ext/target/arm/rse/common/host_drivers/ni_tower/apu/ni_tower_apu_reg.h
similarity index 100%
rename from platform/ext/target/arm/rss/common/host_drivers/ni_tower/apu/ni_tower_apu_reg.h
rename to platform/ext/target/arm/rse/common/host_drivers/ni_tower/apu/ni_tower_apu_reg.h
diff --git a/platform/ext/target/arm/rss/common/host_drivers/ni_tower/discovery/ni_tower_discovery_drv.c b/platform/ext/target/arm/rse/common/host_drivers/ni_tower/discovery/ni_tower_discovery_drv.c
similarity index 100%
rename from platform/ext/target/arm/rss/common/host_drivers/ni_tower/discovery/ni_tower_discovery_drv.c
rename to platform/ext/target/arm/rse/common/host_drivers/ni_tower/discovery/ni_tower_discovery_drv.c
diff --git a/platform/ext/target/arm/rss/common/host_drivers/ni_tower/discovery/ni_tower_discovery_drv.h b/platform/ext/target/arm/rse/common/host_drivers/ni_tower/discovery/ni_tower_discovery_drv.h
similarity index 100%
rename from platform/ext/target/arm/rss/common/host_drivers/ni_tower/discovery/ni_tower_discovery_drv.h
rename to platform/ext/target/arm/rse/common/host_drivers/ni_tower/discovery/ni_tower_discovery_drv.h
diff --git a/platform/ext/target/arm/rss/common/host_drivers/ni_tower/discovery/ni_tower_discovery_reg.h b/platform/ext/target/arm/rse/common/host_drivers/ni_tower/discovery/ni_tower_discovery_reg.h
similarity index 100%
rename from platform/ext/target/arm/rss/common/host_drivers/ni_tower/discovery/ni_tower_discovery_reg.h
rename to platform/ext/target/arm/rse/common/host_drivers/ni_tower/discovery/ni_tower_discovery_reg.h
diff --git a/platform/ext/target/arm/rss/common/host_drivers/ni_tower/ni_tower_drv.h b/platform/ext/target/arm/rse/common/host_drivers/ni_tower/ni_tower_drv.h
similarity index 100%
rename from platform/ext/target/arm/rss/common/host_drivers/ni_tower/ni_tower_drv.h
rename to platform/ext/target/arm/rse/common/host_drivers/ni_tower/ni_tower_drv.h
diff --git a/platform/ext/target/arm/rss/common/host_drivers/ni_tower/ni_tower_rss_drv.c b/platform/ext/target/arm/rse/common/host_drivers/ni_tower/ni_tower_rse_drv.c
similarity index 98%
rename from platform/ext/target/arm/rss/common/host_drivers/ni_tower/ni_tower_rss_drv.c
rename to platform/ext/target/arm/rse/common/host_drivers/ni_tower/ni_tower_rse_drv.c
index ec1c112..e8a291f 100644
--- a/platform/ext/target/arm/rss/common/host_drivers/ni_tower/ni_tower_rss_drv.c
+++ b/platform/ext/target/arm/rse/common/host_drivers/ni_tower/ni_tower_rse_drv.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  *
  */
-#include "ni_tower_rss_drv.h"
+#include "ni_tower_rse_drv.h"
 
 #include <stddef.h>
 
diff --git a/platform/ext/target/arm/rss/common/host_drivers/ni_tower/ni_tower_rss_drv.h b/platform/ext/target/arm/rse/common/host_drivers/ni_tower/ni_tower_rse_drv.h
similarity index 95%
rename from platform/ext/target/arm/rss/common/host_drivers/ni_tower/ni_tower_rss_drv.h
rename to platform/ext/target/arm/rse/common/host_drivers/ni_tower/ni_tower_rse_drv.h
index c6531f3..c8a80e9 100644
--- a/platform/ext/target/arm/rss/common/host_drivers/ni_tower/ni_tower_rss_drv.h
+++ b/platform/ext/target/arm/rse/common/host_drivers/ni_tower/ni_tower_rse_drv.h
@@ -5,8 +5,8 @@
  *
  */
 
-#ifndef __NI_TOWER_RSS_DRV_H__
-#define __NI_TOWER_RSS_DRV_H__
+#ifndef __NI_TOWER_RSE_DRV_H__
+#define __NI_TOWER_RSE_DRV_H__
 
 #include <stdint.h>
 
@@ -71,4 +71,4 @@
                            struct ni_tower_apu_cfgs apu_table[],
                            uint32_t apu_table_count);
 
-#endif /* __NI_TOWER_RSS_DRV_H__ */
+#endif /* __NI_TOWER_RSE_DRV_H__ */
diff --git a/platform/ext/target/arm/rss/common/host_drivers/ni_tower/psam/ni_tower_psam_drv.c b/platform/ext/target/arm/rse/common/host_drivers/ni_tower/psam/ni_tower_psam_drv.c
similarity index 100%
rename from platform/ext/target/arm/rss/common/host_drivers/ni_tower/psam/ni_tower_psam_drv.c
rename to platform/ext/target/arm/rse/common/host_drivers/ni_tower/psam/ni_tower_psam_drv.c
diff --git a/platform/ext/target/arm/rss/common/host_drivers/ni_tower/psam/ni_tower_psam_drv.h b/platform/ext/target/arm/rse/common/host_drivers/ni_tower/psam/ni_tower_psam_drv.h
similarity index 100%
rename from platform/ext/target/arm/rss/common/host_drivers/ni_tower/psam/ni_tower_psam_drv.h
rename to platform/ext/target/arm/rse/common/host_drivers/ni_tower/psam/ni_tower_psam_drv.h
diff --git a/platform/ext/target/arm/rss/common/host_drivers/ni_tower/psam/ni_tower_psam_reg.h b/platform/ext/target/arm/rse/common/host_drivers/ni_tower/psam/ni_tower_psam_reg.h
similarity index 100%
rename from platform/ext/target/arm/rss/common/host_drivers/ni_tower/psam/ni_tower_psam_reg.h
rename to platform/ext/target/arm/rse/common/host_drivers/ni_tower/psam/ni_tower_psam_reg.h
diff --git a/platform/ext/target/arm/rss/common/libraries/dma350_checker_layer.c b/platform/ext/target/arm/rse/common/libraries/dma350_checker_layer.c
similarity index 100%
rename from platform/ext/target/arm/rss/common/libraries/dma350_checker_layer.c
rename to platform/ext/target/arm/rse/common/libraries/dma350_checker_layer.c
diff --git a/platform/ext/target/arm/rss/common/libraries/dma350_checker_layer.h b/platform/ext/target/arm/rse/common/libraries/dma350_checker_layer.h
similarity index 100%
rename from platform/ext/target/arm/rss/common/libraries/dma350_checker_layer.h
rename to platform/ext/target/arm/rse/common/libraries/dma350_checker_layer.h
diff --git a/platform/ext/target/arm/rss/common/libraries/dma350_lib.c b/platform/ext/target/arm/rse/common/libraries/dma350_lib.c
similarity index 100%
rename from platform/ext/target/arm/rss/common/libraries/dma350_lib.c
rename to platform/ext/target/arm/rse/common/libraries/dma350_lib.c
diff --git a/platform/ext/target/arm/rss/common/libraries/dma350_lib.h b/platform/ext/target/arm/rse/common/libraries/dma350_lib.h
similarity index 100%
rename from platform/ext/target/arm/rss/common/libraries/dma350_lib.h
rename to platform/ext/target/arm/rse/common/libraries/dma350_lib.h
diff --git a/platform/ext/target/arm/rss/common/libraries/dma350_lib_unprivileged.c b/platform/ext/target/arm/rse/common/libraries/dma350_lib_unprivileged.c
similarity index 100%
rename from platform/ext/target/arm/rss/common/libraries/dma350_lib_unprivileged.c
rename to platform/ext/target/arm/rse/common/libraries/dma350_lib_unprivileged.c
diff --git a/platform/ext/target/arm/rss/common/libraries/dma350_lib_unprivileged.h b/platform/ext/target/arm/rse/common/libraries/dma350_lib_unprivileged.h
similarity index 100%
rename from platform/ext/target/arm/rss/common/libraries/dma350_lib_unprivileged.h
rename to platform/ext/target/arm/rse/common/libraries/dma350_lib_unprivileged.h
diff --git a/platform/ext/target/arm/rss/common/libraries/dma350_privileged_config.h b/platform/ext/target/arm/rse/common/libraries/dma350_privileged_config.h
similarity index 100%
rename from platform/ext/target/arm/rss/common/libraries/dma350_privileged_config.h
rename to platform/ext/target/arm/rse/common/libraries/dma350_privileged_config.h
diff --git a/platform/ext/target/arm/rss/common/libraries/sds.c b/platform/ext/target/arm/rse/common/libraries/sds.c
similarity index 99%
rename from platform/ext/target/arm/rss/common/libraries/sds.c
rename to platform/ext/target/arm/rse/common/libraries/sds.c
index b496385..432ded0 100644
--- a/platform/ext/target/arm/rss/common/libraries/sds.c
+++ b/platform/ext/target/arm/rse/common/libraries/sds.c
@@ -10,7 +10,7 @@
 #include <stdint.h>
 
 #include "host_base_address.h"
-#include "rss_comms_atu.h"
+#include "rse_comms_atu.h"
 #include "sds.h"
 #include "tfm_plat_defs.h"
 #include "utilities.h"
diff --git a/platform/ext/target/arm/rss/common/libraries/sds.h b/platform/ext/target/arm/rse/common/libraries/sds.h
similarity index 100%
rename from platform/ext/target/arm/rss/common/libraries/sds.h
rename to platform/ext/target/arm/rse/common/libraries/sds.h
diff --git a/platform/ext/target/arm/rss/common/libraries/sds_svc.c b/platform/ext/target/arm/rse/common/libraries/sds_svc.c
similarity index 100%
rename from platform/ext/target/arm/rss/common/libraries/sds_svc.c
rename to platform/ext/target/arm/rse/common/libraries/sds_svc.c
diff --git a/platform/ext/target/arm/rss/common/manifest/ns_agent_mailbox.yaml b/platform/ext/target/arm/rse/common/manifest/ns_agent_mailbox.yaml
similarity index 100%
rename from platform/ext/target/arm/rss/common/manifest/ns_agent_mailbox.yaml
rename to platform/ext/target/arm/rse/common/manifest/ns_agent_mailbox.yaml
diff --git a/platform/ext/target/arm/rss/common/manifest/tfm_crypto.yaml b/platform/ext/target/arm/rse/common/manifest/tfm_crypto.yaml
similarity index 100%
rename from platform/ext/target/arm/rss/common/manifest/tfm_crypto.yaml
rename to platform/ext/target/arm/rse/common/manifest/tfm_crypto.yaml
diff --git a/platform/ext/target/arm/rss/common/manifest/tfm_initial_attestation.yaml b/platform/ext/target/arm/rse/common/manifest/tfm_initial_attestation.yaml
similarity index 100%
rename from platform/ext/target/arm/rss/common/manifest/tfm_initial_attestation.yaml
rename to platform/ext/target/arm/rse/common/manifest/tfm_initial_attestation.yaml
diff --git a/platform/ext/target/arm/rss/common/manifest/tfm_manifest_list.yaml b/platform/ext/target/arm/rse/common/manifest/tfm_manifest_list.yaml
similarity index 93%
rename from platform/ext/target/arm/rss/common/manifest/tfm_manifest_list.yaml
rename to platform/ext/target/arm/rse/common/manifest/tfm_manifest_list.yaml
index 8e63ed7..2dfdc56 100644
--- a/platform/ext/target/arm/rss/common/manifest/tfm_manifest_list.yaml
+++ b/platform/ext/target/arm/rse/common/manifest/tfm_manifest_list.yaml
@@ -26,7 +26,7 @@
   "manifest_list": [
     {
       "description": "Non-Secure Mailbox Agent",
-      "manifest": "platform/ext/target/arm/rss/common/manifest/ns_agent_mailbox.yaml",
+      "manifest": "platform/ext/target/arm/rse/common/manifest/ns_agent_mailbox.yaml",
       "output_path": "secure_fw/partitions/ns_agent_mailbox",
       "conditional": "TFM_PARTITION_NS_AGENT_MAILBOX",
       "version_major": 0,
@@ -41,7 +41,7 @@
     },
     {
       "description": "TFM Crypto Service",
-      "manifest": "platform/ext/target/arm/rss/common/manifest/tfm_crypto.yaml",
+      "manifest": "platform/ext/target/arm/rse/common/manifest/tfm_crypto.yaml",
       "output_path": "secure_fw/partitions/crypto",
       "conditional": "TFM_PARTITION_CRYPTO",
       "version_major": 0,
@@ -69,7 +69,7 @@
     },
     {
       "description": "TFM Initial Attestation Service",
-      "manifest": "platform/ext/target/arm/rss/common/manifest/tfm_initial_attestation.yaml",
+      "manifest": "platform/ext/target/arm/rse/common/manifest/tfm_initial_attestation.yaml",
       "output_path": "secure_fw/partitions/initial_attestation",
       "conditional": "TFM_PARTITION_INITIAL_ATTESTATION",
       "version_major": 0,
diff --git a/platform/ext/target/arm/rss/common/mbedtls_extra_config.h b/platform/ext/target/arm/rse/common/mbedtls_extra_config.h
similarity index 100%
rename from platform/ext/target/arm/rss/common/mbedtls_extra_config.h
rename to platform/ext/target/arm/rse/common/mbedtls_extra_config.h
diff --git a/platform/ext/target/arm/rss/common/native_drivers/atu_rss_drv.c b/platform/ext/target/arm/rse/common/native_drivers/atu_rse_drv.c
similarity index 99%
rename from platform/ext/target/arm/rss/common/native_drivers/atu_rss_drv.c
rename to platform/ext/target/arm/rse/common/native_drivers/atu_rse_drv.c
index f039aae..c2b2681 100644
--- a/platform/ext/target/arm/rss/common/native_drivers/atu_rss_drv.c
+++ b/platform/ext/target/arm/rse/common/native_drivers/atu_rse_drv.c
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "atu_rss_drv.h"
+#include "atu_rse_drv.h"
 
 #include <stddef.h>
 
diff --git a/platform/ext/target/arm/rss/common/native_drivers/atu_rss_drv.h b/platform/ext/target/arm/rse/common/native_drivers/atu_rse_drv.h
similarity index 98%
rename from platform/ext/target/arm/rss/common/native_drivers/atu_rss_drv.h
rename to platform/ext/target/arm/rse/common/native_drivers/atu_rse_drv.h
index f1d58de..f75910e 100644
--- a/platform/ext/target/arm/rss/common/native_drivers/atu_rss_drv.h
+++ b/platform/ext/target/arm/rse/common/native_drivers/atu_rse_drv.h
@@ -15,12 +15,12 @@
  */
 
 /**
- * \file atu_rss_drv.h
+ * \file atu_rse_drv.h
  * \brief Driver for Arm Address Translation Unit (ATU).
  */
 
-#ifndef __ATU_RSS_DRV_H__
-#define __ATU_RSS_DRV_H__
+#ifndef __ATU_RSE_DRV_H__
+#define __ATU_RSE_DRV_H__
 
 #include <stdint.h>
 #include <stdbool.h>
@@ -358,4 +358,4 @@
 }
 #endif
 
-#endif /* __ATU_RSS_DRV_H__ */
+#endif /* __ATU_RSE_DRV_H__ */
diff --git a/platform/ext/target/arm/rss/common/native_drivers/dma350_ch_drv.c b/platform/ext/target/arm/rse/common/native_drivers/dma350_ch_drv.c
similarity index 100%
rename from platform/ext/target/arm/rss/common/native_drivers/dma350_ch_drv.c
rename to platform/ext/target/arm/rse/common/native_drivers/dma350_ch_drv.c
diff --git a/platform/ext/target/arm/rss/common/native_drivers/dma350_ch_drv.h b/platform/ext/target/arm/rse/common/native_drivers/dma350_ch_drv.h
similarity index 100%
rename from platform/ext/target/arm/rss/common/native_drivers/dma350_ch_drv.h
rename to platform/ext/target/arm/rse/common/native_drivers/dma350_ch_drv.h
diff --git a/platform/ext/target/arm/rss/common/native_drivers/dma350_drv.c b/platform/ext/target/arm/rse/common/native_drivers/dma350_drv.c
similarity index 100%
rename from platform/ext/target/arm/rss/common/native_drivers/dma350_drv.c
rename to platform/ext/target/arm/rse/common/native_drivers/dma350_drv.c
diff --git a/platform/ext/target/arm/rss/common/native_drivers/dma350_drv.h b/platform/ext/target/arm/rse/common/native_drivers/dma350_drv.h
similarity index 100%
rename from platform/ext/target/arm/rss/common/native_drivers/dma350_drv.h
rename to platform/ext/target/arm/rse/common/native_drivers/dma350_drv.h
diff --git a/platform/ext/target/arm/rss/common/native_drivers/dma350_regdef.h b/platform/ext/target/arm/rse/common/native_drivers/dma350_regdef.h
similarity index 100%
rename from platform/ext/target/arm/rss/common/native_drivers/dma350_regdef.h
rename to platform/ext/target/arm/rse/common/native_drivers/dma350_regdef.h
diff --git a/platform/ext/target/arm/rss/common/native_drivers/integrity_checker_drv.c b/platform/ext/target/arm/rse/common/native_drivers/integrity_checker_drv.c
similarity index 100%
rename from platform/ext/target/arm/rss/common/native_drivers/integrity_checker_drv.c
rename to platform/ext/target/arm/rse/common/native_drivers/integrity_checker_drv.c
diff --git a/platform/ext/target/arm/rss/common/native_drivers/integrity_checker_drv.h b/platform/ext/target/arm/rse/common/native_drivers/integrity_checker_drv.h
similarity index 100%
rename from platform/ext/target/arm/rss/common/native_drivers/integrity_checker_drv.h
rename to platform/ext/target/arm/rse/common/native_drivers/integrity_checker_drv.h
diff --git a/platform/ext/target/arm/rss/common/native_drivers/kmu_drv.c b/platform/ext/target/arm/rse/common/native_drivers/kmu_drv.c
similarity index 100%
rename from platform/ext/target/arm/rss/common/native_drivers/kmu_drv.c
rename to platform/ext/target/arm/rse/common/native_drivers/kmu_drv.c
diff --git a/platform/ext/target/arm/rss/common/native_drivers/kmu_drv.h b/platform/ext/target/arm/rse/common/native_drivers/kmu_drv.h
similarity index 100%
rename from platform/ext/target/arm/rss/common/native_drivers/kmu_drv.h
rename to platform/ext/target/arm/rse/common/native_drivers/kmu_drv.h
diff --git a/platform/ext/target/arm/rss/common/native_drivers/lcm_drv.c b/platform/ext/target/arm/rse/common/native_drivers/lcm_drv.c
similarity index 100%
rename from platform/ext/target/arm/rss/common/native_drivers/lcm_drv.c
rename to platform/ext/target/arm/rse/common/native_drivers/lcm_drv.c
diff --git a/platform/ext/target/arm/rss/common/native_drivers/lcm_drv.h b/platform/ext/target/arm/rse/common/native_drivers/lcm_drv.h
similarity index 100%
rename from platform/ext/target/arm/rss/common/native_drivers/lcm_drv.h
rename to platform/ext/target/arm/rse/common/native_drivers/lcm_drv.h
diff --git a/platform/ext/target/arm/rss/common/native_drivers/mhu.h b/platform/ext/target/arm/rse/common/native_drivers/mhu.h
similarity index 100%
rename from platform/ext/target/arm/rss/common/native_drivers/mhu.h
rename to platform/ext/target/arm/rse/common/native_drivers/mhu.h
diff --git a/platform/ext/target/arm/rss/common/native_drivers/mhu_v2_x.c b/platform/ext/target/arm/rse/common/native_drivers/mhu_v2_x.c
similarity index 100%
rename from platform/ext/target/arm/rss/common/native_drivers/mhu_v2_x.c
rename to platform/ext/target/arm/rse/common/native_drivers/mhu_v2_x.c
diff --git a/platform/ext/target/arm/rss/common/native_drivers/mhu_v2_x.h b/platform/ext/target/arm/rse/common/native_drivers/mhu_v2_x.h
similarity index 100%
rename from platform/ext/target/arm/rss/common/native_drivers/mhu_v2_x.h
rename to platform/ext/target/arm/rse/common/native_drivers/mhu_v2_x.h
diff --git a/platform/ext/target/arm/rss/common/native_drivers/mhu_v3_x.c b/platform/ext/target/arm/rse/common/native_drivers/mhu_v3_x.c
similarity index 100%
rename from platform/ext/target/arm/rss/common/native_drivers/mhu_v3_x.c
rename to platform/ext/target/arm/rse/common/native_drivers/mhu_v3_x.c
diff --git a/platform/ext/target/arm/rss/common/native_drivers/mhu_v3_x.h b/platform/ext/target/arm/rse/common/native_drivers/mhu_v3_x.h
similarity index 100%
rename from platform/ext/target/arm/rss/common/native_drivers/mhu_v3_x.h
rename to platform/ext/target/arm/rse/common/native_drivers/mhu_v3_x.h
diff --git a/platform/ext/target/arm/rss/common/native_drivers/mhu_wrapper_v2_x.c b/platform/ext/target/arm/rse/common/native_drivers/mhu_wrapper_v2_x.c
similarity index 100%
rename from platform/ext/target/arm/rss/common/native_drivers/mhu_wrapper_v2_x.c
rename to platform/ext/target/arm/rse/common/native_drivers/mhu_wrapper_v2_x.c
diff --git a/platform/ext/target/arm/rss/common/native_drivers/mhu_wrapper_v3_x.c b/platform/ext/target/arm/rse/common/native_drivers/mhu_wrapper_v3_x.c
similarity index 100%
rename from platform/ext/target/arm/rss/common/native_drivers/mhu_wrapper_v3_x.c
rename to platform/ext/target/arm/rse/common/native_drivers/mhu_wrapper_v3_x.c
diff --git a/platform/ext/target/arm/rss/common/native_drivers/ppc_rss_drv.c b/platform/ext/target/arm/rse/common/native_drivers/ppc_rse_drv.c
similarity index 99%
rename from platform/ext/target/arm/rss/common/native_drivers/ppc_rss_drv.c
rename to platform/ext/target/arm/rse/common/native_drivers/ppc_rse_drv.c
index 7d9cf9f..a62a3c4 100644
--- a/platform/ext/target/arm/rss/common/native_drivers/ppc_rss_drv.c
+++ b/platform/ext/target/arm/rse/common/native_drivers/ppc_rse_drv.c
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "ppc_rss_drv.h"
+#include "ppc_rse_drv.h"
 #include <stdint.h>
 #include <stdbool.h>
 #include <platform_regs.h>
diff --git a/platform/ext/target/arm/rss/common/native_drivers/ppc_rss_drv.h b/platform/ext/target/arm/rse/common/native_drivers/ppc_rse_drv.h
similarity index 98%
rename from platform/ext/target/arm/rss/common/native_drivers/ppc_rss_drv.h
rename to platform/ext/target/arm/rse/common/native_drivers/ppc_rse_drv.h
index 5da9850..3ad4a69 100644
--- a/platform/ext/target/arm/rss/common/native_drivers/ppc_rss_drv.h
+++ b/platform/ext/target/arm/rse/common/native_drivers/ppc_rse_drv.h
@@ -15,12 +15,12 @@
  */
 
 /**
- * \file ppc_rss_drv.h
+ * \file ppc_rse_drv.h
  * \brief Generic driver for RSS Peripheral Protection Controllers (PPC).
  */
 
-#ifndef __PPC_RSS_DRV_H__
-#define __PPC_RSS_DRV_H__
+#ifndef __PPC_RSE_DRV_H__
+#define __PPC_RSE_DRV_H__
 
 #include <stdint.h>
 #include <stdbool.h>
@@ -217,4 +217,4 @@
 #ifdef __cplusplus
 }
 #endif
-#endif /* __PPC_RSS_DRV_H__ */
+#endif /* __PPC_RSE_DRV_H__ */
diff --git a/platform/ext/target/arm/rss/common/native_drivers/sic_drv.c b/platform/ext/target/arm/rse/common/native_drivers/sic_drv.c
similarity index 100%
rename from platform/ext/target/arm/rss/common/native_drivers/sic_drv.c
rename to platform/ext/target/arm/rse/common/native_drivers/sic_drv.c
diff --git a/platform/ext/target/arm/rss/common/native_drivers/sic_drv.h b/platform/ext/target/arm/rse/common/native_drivers/sic_drv.h
similarity index 100%
rename from platform/ext/target/arm/rss/common/native_drivers/sic_drv.h
rename to platform/ext/target/arm/rse/common/native_drivers/sic_drv.h
diff --git a/platform/ext/target/arm/rss/common/native_drivers/tram_drv.c b/platform/ext/target/arm/rse/common/native_drivers/tram_drv.c
similarity index 100%
rename from platform/ext/target/arm/rss/common/native_drivers/tram_drv.c
rename to platform/ext/target/arm/rse/common/native_drivers/tram_drv.c
diff --git a/platform/ext/target/arm/rss/common/native_drivers/tram_drv.h b/platform/ext/target/arm/rse/common/native_drivers/tram_drv.h
similarity index 100%
rename from platform/ext/target/arm/rss/common/native_drivers/tram_drv.h
rename to platform/ext/target/arm/rse/common/native_drivers/tram_drv.h
diff --git a/platform/ext/target/arm/rss/common/ns/common.cmake b/platform/ext/target/arm/rse/common/ns/common.cmake
similarity index 99%
rename from platform/ext/target/arm/rss/common/ns/common.cmake
rename to platform/ext/target/arm/rse/common/ns/common.cmake
index f1b648c..ec0206b 100644
--- a/platform/ext/target/arm/rss/common/ns/common.cmake
+++ b/platform/ext/target/arm/rse/common/ns/common.cmake
@@ -14,7 +14,7 @@
 target_sources(platform_ns
     PRIVATE
         device/source/device_definition.c
-        device/source/startup_rss.c
+        device/source/startup_rse.c
         device/source/system_core_init.c
         uart_stdout.c
 )
diff --git a/platform/ext/target/arm/rss/common/ns/config.cmake.in b/platform/ext/target/arm/rse/common/ns/config.cmake.in
similarity index 100%
rename from platform/ext/target/arm/rss/common/ns/config.cmake.in
rename to platform/ext/target/arm/rse/common/ns/config.cmake.in
diff --git a/platform/ext/target/arm/rss/common/ns/cpuarch.cmake b/platform/ext/target/arm/rse/common/ns/cpuarch.cmake
similarity index 100%
rename from platform/ext/target/arm/rss/common/ns/cpuarch.cmake
rename to platform/ext/target/arm/rse/common/ns/cpuarch.cmake
diff --git a/platform/ext/target/arm/rss/common/nv_counters.c b/platform/ext/target/arm/rse/common/nv_counters.c
similarity index 100%
rename from platform/ext/target/arm/rss/common/nv_counters.c
rename to platform/ext/target/arm/rse/common/nv_counters.c
diff --git a/platform/ext/target/arm/rss/common/otp_lcm.c b/platform/ext/target/arm/rse/common/otp_lcm.c
similarity index 99%
rename from platform/ext/target/arm/rss/common/otp_lcm.c
rename to platform/ext/target/arm/rse/common/otp_lcm.c
index 84390a9..ffb60fe 100644
--- a/platform/ext/target/arm/rss/common/otp_lcm.c
+++ b/platform/ext/target/arm/rse/common/otp_lcm.c
@@ -14,13 +14,13 @@
 #include "cmsis.h"
 #include "uart_stdout.h"
 #include "tfm_hal_platform.h"
-#include "rss_memory_sizes.h"
+#include "rse_memory_sizes.h"
 #ifdef RSS_ENCRYPTED_OTP_KEYS
 #include "cc3xx_drv.h"
 #include "kmu_drv.h"
 #endif /* RSS_ENCRYPTED_OTP_KEYS */
 #ifdef RSS_BRINGUP_OTP_EMULATION
-#include "rss_otp_emulation.h"
+#include "rse_otp_emulation.h"
 #endif /* RSS_BRINGUP_OTP_EMULATION */
 
 #ifdef MCUBOOT_SIGN_EC384
diff --git a/platform/ext/target/arm/rss/common/partition/platform_base_address.h b/platform/ext/target/arm/rse/common/partition/platform_base_address.h
similarity index 99%
rename from platform/ext/target/arm/rss/common/partition/platform_base_address.h
rename to platform/ext/target/arm/rse/common/partition/platform_base_address.h
index 29b9d02..d319298 100644
--- a/platform/ext/target/arm/rss/common/partition/platform_base_address.h
+++ b/platform/ext/target/arm/rse/common/partition/platform_base_address.h
@@ -22,9 +22,9 @@
 #ifndef __PLATFORM_BASE_ADDRESS_H__
 #define __PLATFORM_BASE_ADDRESS_H__
 
-#include "rss_memory_sizes.h"
+#include "rse_memory_sizes.h"
 #ifdef RSS_HAS_EXPANSION_PERIPHERALS
-#include "rss_expansion_base_address.h"
+#include "rse_expansion_base_address.h"
 #endif /* RSS_HAS_EXPANSION_PERIPHERALS */
 
 /* ======= Defines peripherals memory map addresses ======= */
diff --git a/platform/ext/target/arm/rss/common/partition/region_defs.h b/platform/ext/target/arm/rse/common/partition/region_defs.h
similarity index 100%
rename from platform/ext/target/arm/rss/common/partition/region_defs.h
rename to platform/ext/target/arm/rse/common/partition/region_defs.h
diff --git a/platform/ext/target/arm/rss/common/plat_def_fip_uuid.h b/platform/ext/target/arm/rse/common/plat_def_fip_uuid.h
similarity index 100%
rename from platform/ext/target/arm/rss/common/plat_def_fip_uuid.h
rename to platform/ext/target/arm/rse/common/plat_def_fip_uuid.h
diff --git a/platform/ext/target/arm/rss/common/plat_test.c b/platform/ext/target/arm/rse/common/plat_test.c
similarity index 100%
rename from platform/ext/target/arm/rss/common/plat_test.c
rename to platform/ext/target/arm/rse/common/plat_test.c
diff --git a/platform/ext/target/arm/rss/common/platform_builtin_key_loader_ids.h b/platform/ext/target/arm/rse/common/platform_builtin_key_loader_ids.h
similarity index 100%
rename from platform/ext/target/arm/rss/common/platform_builtin_key_loader_ids.h
rename to platform/ext/target/arm/rse/common/platform_builtin_key_loader_ids.h
diff --git a/platform/ext/target/arm/rss/common/platform_dcu.c b/platform/ext/target/arm/rse/common/platform_dcu.c
similarity index 100%
rename from platform/ext/target/arm/rss/common/platform_dcu.c
rename to platform/ext/target/arm/rse/common/platform_dcu.c
diff --git a/platform/ext/target/arm/rss/common/platform_dcu.h b/platform/ext/target/arm/rse/common/platform_dcu.h
similarity index 100%
rename from platform/ext/target/arm/rss/common/platform_dcu.h
rename to platform/ext/target/arm/rse/common/platform_dcu.h
diff --git a/platform/ext/target/arm/rss/common/platform_ns_mailbox.c b/platform/ext/target/arm/rse/common/platform_ns_mailbox.c
similarity index 100%
rename from platform/ext/target/arm/rss/common/platform_ns_mailbox.c
rename to platform/ext/target/arm/rse/common/platform_ns_mailbox.c
diff --git a/platform/ext/target/arm/rss/common/platform_nv_counters_ids.h b/platform/ext/target/arm/rse/common/platform_nv_counters_ids.h
similarity index 100%
rename from platform/ext/target/arm/rss/common/platform_nv_counters_ids.h
rename to platform/ext/target/arm/rse/common/platform_nv_counters_ids.h
diff --git a/platform/ext/target/arm/rss/common/platform_otp_ids.h b/platform/ext/target/arm/rse/common/platform_otp_ids.h
similarity index 100%
rename from platform/ext/target/arm/rss/common/platform_otp_ids.h
rename to platform/ext/target/arm/rse/common/platform_otp_ids.h
diff --git a/platform/ext/target/arm/rss/common/platform_svc_handler.c b/platform/ext/target/arm/rse/common/platform_svc_handler.c
similarity index 100%
rename from platform/ext/target/arm/rss/common/platform_svc_handler.c
rename to platform/ext/target/arm/rse/common/platform_svc_handler.c
diff --git a/platform/ext/target/arm/rss/common/platform_svc_numbers.h b/platform/ext/target/arm/rse/common/platform_svc_numbers.h
similarity index 100%
rename from platform/ext/target/arm/rss/common/platform_svc_numbers.h
rename to platform/ext/target/arm/rse/common/platform_svc_numbers.h
diff --git a/platform/ext/target/arm/rss/common/provisioning/CMakeLists.txt b/platform/ext/target/arm/rse/common/provisioning/CMakeLists.txt
similarity index 100%
rename from platform/ext/target/arm/rss/common/provisioning/CMakeLists.txt
rename to platform/ext/target/arm/rse/common/provisioning/CMakeLists.txt
diff --git a/platform/ext/target/arm/rss/common/provisioning/bl1_provisioning.c b/platform/ext/target/arm/rse/common/provisioning/bl1_provisioning.c
similarity index 98%
rename from platform/ext/target/arm/rss/common/provisioning/bl1_provisioning.c
rename to platform/ext/target/arm/rse/common/provisioning/bl1_provisioning.c
index 0e7a21e..bfbb065 100644
--- a/platform/ext/target/arm/rss/common/provisioning/bl1_provisioning.c
+++ b/platform/ext/target/arm/rse/common/provisioning/bl1_provisioning.c
@@ -8,15 +8,15 @@
 #include "tfm_plat_provisioning.h"
 
 #include "log.h"
-#include "rss_provisioning_bundle.h"
+#include "rse_provisioning_bundle.h"
 #include "tfm_plat_otp.h"
 #include "device_definition.h"
 #include "tfm_hal_platform.h"
 #include <string.h>
 #include "platform_regs.h"
 #include "cc3xx_aes.h"
-#include "rss_kmu_slot_ids.h"
-#include "rss_key_derivation.h"
+#include "rse_kmu_slot_ids.h"
+#include "rse_key_derivation.h"
 
 enum rss_gpio_val_t {
     RSS_GPIO_STATE_VIRGIN_IDLE = 0x1,
diff --git a/platform/ext/target/arm/rss/common/provisioning/bl2_stub_provisioning.c b/platform/ext/target/arm/rse/common/provisioning/bl2_stub_provisioning.c
similarity index 100%
rename from platform/ext/target/arm/rss/common/provisioning/bl2_stub_provisioning.c
rename to platform/ext/target/arm/rse/common/provisioning/bl2_stub_provisioning.c
diff --git a/platform/ext/target/arm/rss/common/provisioning/bundle_cm/CMakeLists.txt b/platform/ext/target/arm/rse/common/provisioning/bundle_cm/CMakeLists.txt
similarity index 97%
rename from platform/ext/target/arm/rss/common/provisioning/bundle_cm/CMakeLists.txt
rename to platform/ext/target/arm/rse/common/provisioning/bundle_cm/CMakeLists.txt
index 541e6bb..9e603d7 100644
--- a/platform/ext/target/arm/rss/common/provisioning/bundle_cm/CMakeLists.txt
+++ b/platform/ext/target/arm/rse/common/provisioning/bundle_cm/CMakeLists.txt
@@ -68,7 +68,7 @@
         DEPENDS $<TARGET_FILE_DIR:bl1_2>/bl1_2_padded_hash.bin
         DEPENDS $<TARGET_FILE_DIR:bl1_2>/bl1_2_padded.bin
         bl1_2_padded_bin bl2_signed_bin cm_provisioning_bundle
-        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../rss_create_provisioning_bundle.py
+        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../rse_create_provisioning_bundle.py
         COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE_DIR:cm_provisioning_bundle>/cm_provisioning_bundle.axf cm_provisioning_bundle_${RSS_ID}.axf
         COMMAND ${CMAKE_OBJCOPY} $<TARGET_FILE_DIR:cm_provisioning_bundle>/cm_provisioning_bundle_${RSS_ID}.axf
                         --dump-section CODE=cm_provisioning_code.bin
@@ -76,7 +76,7 @@
                         --dump-section DATA=cm_provisioning_data.bin
         COMMAND ${CMAKE_OBJCOPY} $<TARGET_FILE_DIR:cm_provisioning_bundle>/cm_provisioning_bundle_${RSS_ID}.axf
                         --dump-section VALUES=cm_provisioning_values.bin
-        COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/../rss_create_provisioning_bundle.py
+        COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/../rse_create_provisioning_bundle.py
                         --provisioning_code cm_provisioning_code.bin
                         --provisioning_data cm_provisioning_data.bin
                         --provisioning_values cm_provisioning_values.bin
diff --git a/platform/ext/target/arm/rss/common/provisioning/bundle_cm/cm_dummy_provisioning_data.c b/platform/ext/target/arm/rse/common/provisioning/bundle_cm/cm_dummy_provisioning_data.c
similarity index 96%
rename from platform/ext/target/arm/rss/common/provisioning/bundle_cm/cm_dummy_provisioning_data.c
rename to platform/ext/target/arm/rse/common/provisioning/bundle_cm/cm_dummy_provisioning_data.c
index aa9a0e9..84f1c23 100644
--- a/platform/ext/target/arm/rss/common/provisioning/bundle_cm/cm_dummy_provisioning_data.c
+++ b/platform/ext/target/arm/rse/common/provisioning/bundle_cm/cm_dummy_provisioning_data.c
@@ -5,7 +5,7 @@
  *
  */
 
-#include "rss_provisioning_bundle.h"
+#include "rse_provisioning_bundle.h"
 
 const struct cm_provisioning_data data = {
     /* BL1_2_IMAGE_HASH */
diff --git a/platform/ext/target/arm/rss/common/provisioning/bundle_cm/cm_provisioning_code.c b/platform/ext/target/arm/rse/common/provisioning/bundle_cm/cm_provisioning_code.c
similarity index 99%
rename from platform/ext/target/arm/rss/common/provisioning/bundle_cm/cm_provisioning_code.c
rename to platform/ext/target/arm/rse/common/provisioning/bundle_cm/cm_provisioning_code.c
index 97332be..f7cd5fb 100644
--- a/platform/ext/target/arm/rss/common/provisioning/bundle_cm/cm_provisioning_code.c
+++ b/platform/ext/target/arm/rse/common/provisioning/bundle_cm/cm_provisioning_code.c
@@ -6,7 +6,7 @@
  */
 
 #include "tfm_plat_otp.h"
-#include "rss_provisioning_bundle.h"
+#include "rse_provisioning_bundle.h"
 
 #include "flash_layout.h"
 #include "Driver_Flash.h"
diff --git a/platform/ext/target/arm/rss/common/provisioning/bundle_common/provisioning_bundle.ld b/platform/ext/target/arm/rse/common/provisioning/bundle_common/provisioning_bundle.ld
similarity index 100%
rename from platform/ext/target/arm/rss/common/provisioning/bundle_common/provisioning_bundle.ld
rename to platform/ext/target/arm/rse/common/provisioning/bundle_common/provisioning_bundle.ld
diff --git a/platform/ext/target/arm/rss/common/provisioning/bundle_common/provisioning_bundle.sct b/platform/ext/target/arm/rse/common/provisioning/bundle_common/provisioning_bundle.sct
similarity index 100%
rename from platform/ext/target/arm/rss/common/provisioning/bundle_common/provisioning_bundle.sct
rename to platform/ext/target/arm/rse/common/provisioning/bundle_common/provisioning_bundle.sct
diff --git a/platform/ext/target/arm/rss/common/provisioning/bundle_common/rss_provisioning_bundle.h b/platform/ext/target/arm/rse/common/provisioning/bundle_common/rse_provisioning_bundle.h
similarity index 95%
rename from platform/ext/target/arm/rss/common/provisioning/bundle_common/rss_provisioning_bundle.h
rename to platform/ext/target/arm/rse/common/provisioning/bundle_common/rse_provisioning_bundle.h
index e38bcbe..d6dd609 100644
--- a/platform/ext/target/arm/rss/common/provisioning/bundle_common/rss_provisioning_bundle.h
+++ b/platform/ext/target/arm/rse/common/provisioning/bundle_common/rse_provisioning_bundle.h
@@ -5,8 +5,8 @@
  *
  */
 
-#ifndef __RSS_PROVISIONING_BUNDLE_H__
-#define __RSS_PROVISIONING_BUNDLE_H__
+#ifndef __RSE_PROVISIONING_BUNDLE_H__
+#define __RSE_PROVISIONING_BUNDLE_H__
 
 #include "stdint.h"
 #include "region_defs.h"
@@ -83,4 +83,4 @@
 }
 #endif
 
-#endif /* __RSS_PROVISIONING_BUNDLE_H__ */
+#endif /* __RSE_PROVISIONING_BUNDLE_H__ */
diff --git a/platform/ext/target/arm/rss/common/provisioning/bundle_dm/CMakeLists.txt b/platform/ext/target/arm/rse/common/provisioning/bundle_dm/CMakeLists.txt
similarity index 96%
rename from platform/ext/target/arm/rss/common/provisioning/bundle_dm/CMakeLists.txt
rename to platform/ext/target/arm/rse/common/provisioning/bundle_dm/CMakeLists.txt
index 120c3c3..0228ab8 100644
--- a/platform/ext/target/arm/rss/common/provisioning/bundle_dm/CMakeLists.txt
+++ b/platform/ext/target/arm/rse/common/provisioning/bundle_dm/CMakeLists.txt
@@ -66,14 +66,14 @@
     DEPENDS $<TARGET_FILE_DIR:bl1_2>/bl1_2_padded_hash.bin
     DEPENDS $<TARGET_FILE_DIR:bl1_2>/bl1_2_padded.bin
     bl1_2_padded_bin bl2_signed_bin dm_provisioning_bundle
-    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../rss_create_provisioning_bundle.py
+    DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../rse_create_provisioning_bundle.py
     COMMAND ${CMAKE_OBJCOPY} $<TARGET_FILE_DIR:dm_provisioning_bundle>/dm_provisioning_bundle.axf
                     --dump-section CODE=dm_provisioning_code.bin
     COMMAND ${CMAKE_OBJCOPY} $<TARGET_FILE_DIR:dm_provisioning_bundle>/dm_provisioning_bundle.axf
                     --dump-section DATA=dm_provisioning_data.bin
     COMMAND ${CMAKE_OBJCOPY} $<TARGET_FILE_DIR:dm_provisioning_bundle>/dm_provisioning_bundle.axf
                     --dump-section VALUES=dm_provisioning_values.bin
-    COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/../rss_create_provisioning_bundle.py
+    COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/../rse_create_provisioning_bundle.py
                     --provisioning_code dm_provisioning_code.bin
                     --provisioning_data dm_provisioning_data.bin
                     --provisioning_values dm_provisioning_values.bin
diff --git a/platform/ext/target/arm/rss/common/provisioning/bundle_dm/dm_dummy_provisioning_data.c b/platform/ext/target/arm/rse/common/provisioning/bundle_dm/dm_dummy_provisioning_data.c
similarity index 99%
rename from platform/ext/target/arm/rss/common/provisioning/bundle_dm/dm_dummy_provisioning_data.c
rename to platform/ext/target/arm/rse/common/provisioning/bundle_dm/dm_dummy_provisioning_data.c
index e5e17cb..4094ccd 100644
--- a/platform/ext/target/arm/rss/common/provisioning/bundle_dm/dm_dummy_provisioning_data.c
+++ b/platform/ext/target/arm/rse/common/provisioning/bundle_dm/dm_dummy_provisioning_data.c
@@ -6,7 +6,7 @@
  */
 
 #include "config_tfm.h"
-#include "rss_provisioning_bundle.h"
+#include "rse_provisioning_bundle.h"
 
 #if (MCUBOOT_SIGNATURE_TYPE == RSA-2048)
 #define ASSEMBLY_AND_TEST_PROV_DATA_KIND_0 {             \
diff --git a/platform/ext/target/arm/rss/common/provisioning/bundle_dm/dm_provisioning_code.c b/platform/ext/target/arm/rse/common/provisioning/bundle_dm/dm_provisioning_code.c
similarity index 98%
rename from platform/ext/target/arm/rss/common/provisioning/bundle_dm/dm_provisioning_code.c
rename to platform/ext/target/arm/rse/common/provisioning/bundle_dm/dm_provisioning_code.c
index 9516925..5c187f2 100644
--- a/platform/ext/target/arm/rss/common/provisioning/bundle_dm/dm_provisioning_code.c
+++ b/platform/ext/target/arm/rse/common/provisioning/bundle_dm/dm_provisioning_code.c
@@ -6,7 +6,7 @@
  */
 
 #include "tfm_plat_otp.h"
-#include "rss_provisioning_bundle.h"
+#include "rse_provisioning_bundle.h"
 
 #include "trng.h"
 
diff --git a/platform/ext/target/arm/rss/common/provisioning/dummy_scp_data.bin b/platform/ext/target/arm/rse/common/provisioning/dummy_scp_data.bin
similarity index 100%
rename from platform/ext/target/arm/rss/common/provisioning/dummy_scp_data.bin
rename to platform/ext/target/arm/rse/common/provisioning/dummy_scp_data.bin
Binary files differ
diff --git a/platform/ext/target/arm/rss/common/provisioning/pci_krtl_dummy.bin b/platform/ext/target/arm/rse/common/provisioning/pci_krtl_dummy.bin
similarity index 100%
rename from platform/ext/target/arm/rss/common/provisioning/pci_krtl_dummy.bin
rename to platform/ext/target/arm/rse/common/provisioning/pci_krtl_dummy.bin
diff --git a/platform/ext/target/arm/rss/common/provisioning/rss_create_provisioning_bundle.py b/platform/ext/target/arm/rse/common/provisioning/rse_create_provisioning_bundle.py
similarity index 100%
rename from platform/ext/target/arm/rss/common/provisioning/rss_create_provisioning_bundle.py
rename to platform/ext/target/arm/rse/common/provisioning/rse_create_provisioning_bundle.py
diff --git a/platform/ext/target/arm/rss/common/provisioning/runtime_stub_provisioning.c b/platform/ext/target/arm/rse/common/provisioning/runtime_stub_provisioning.c
similarity index 100%
rename from platform/ext/target/arm/rss/common/provisioning/runtime_stub_provisioning.c
rename to platform/ext/target/arm/rse/common/provisioning/runtime_stub_provisioning.c
diff --git a/platform/ext/target/arm/rss/common/provisioning/tci_krtl.bin b/platform/ext/target/arm/rse/common/provisioning/tci_krtl.bin
similarity index 100%
rename from platform/ext/target/arm/rss/common/provisioning/tci_krtl.bin
rename to platform/ext/target/arm/rse/common/provisioning/tci_krtl.bin
Binary files differ
diff --git a/platform/ext/target/arm/rss/common/rss_comms/CMakeLists.txt b/platform/ext/target/arm/rse/common/rse_comms/CMakeLists.txt
similarity index 78%
rename from platform/ext/target/arm/rss/common/rss_comms/CMakeLists.txt
rename to platform/ext/target/arm/rse/common/rse_comms/CMakeLists.txt
index 622c989..7c323af 100644
--- a/platform/ext/target/arm/rss/common/rss_comms/CMakeLists.txt
+++ b/platform/ext/target/arm/rse/common/rse_comms/CMakeLists.txt
@@ -12,13 +12,13 @@
 
 target_sources(platform_s
     PRIVATE
-        rss_comms.c
-        rss_comms_hal.c
-        rss_comms_queue.c
-        rss_comms_protocol.c
-        rss_comms_protocol_embed.c
-        rss_comms_protocol_pointer_access.c
-        rss_comms_atu.c
+        rse_comms.c
+        rse_comms_hal.c
+        rse_comms_queue.c
+        rse_comms_protocol.c
+        rse_comms_protocol_embed.c
+        rse_comms_protocol_pointer_access.c
+        rse_comms_atu.c
 )
 
 target_compile_definitions(platform_s
@@ -35,4 +35,3 @@
         tfm_spm
         tfm_sprt
 )
-
diff --git a/platform/ext/target/arm/rss/common/rss_comms/rss_comms.c b/platform/ext/target/arm/rse/common/rse_comms/rse_comms.c
similarity index 97%
rename from platform/ext/target/arm/rss/common/rss_comms/rss_comms.c
rename to platform/ext/target/arm/rse/common/rse_comms/rse_comms.c
index 6bfd1d7..60ed113 100644
--- a/platform/ext/target/arm/rss/common/rss_comms/rss_comms.c
+++ b/platform/ext/target/arm/rse/common/rse_comms/rse_comms.c
@@ -7,19 +7,19 @@
  *
  */
 
-#include "rss_comms.h"
+#include "rse_comms.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
-#include "rss_comms_hal.h"
-#include "rss_comms_queue.h"
+#include "rse_comms_hal.h"
+#include "rse_comms_queue.h"
 #include "tfm_rpc.h"
 #include "tfm_multi_core.h"
 #include "tfm_hal_multi_core.h"
 #include "tfm_psa_call_pack.h"
 #include "tfm_spm_log.h"
-#include "rss_comms_permissions_hal.h"
+#include "rse_comms_permissions_hal.h"
 
 static struct client_request_t *req_to_process;
 
diff --git a/platform/ext/target/arm/rss/common/rss_comms/rss_comms.h b/platform/ext/target/arm/rse/common/rse_comms/rse_comms.h
similarity index 90%
rename from platform/ext/target/arm/rss/common/rss_comms/rss_comms.h
rename to platform/ext/target/arm/rse/common/rse_comms/rse_comms.h
index 389d8d3..1f84616 100644
--- a/platform/ext/target/arm/rss/common/rss_comms/rss_comms.h
+++ b/platform/ext/target/arm/rse/common/rse_comms/rse_comms.h
@@ -5,12 +5,12 @@
  *
  */
 
-#ifndef __RSS_COMMS_H__
-#define __RSS_COMMS_H__
+#ifndef __RSE_COMMS_H__
+#define __RSE_COMMS_H__
 
 #include "psa/client.h"
 #include "cmsis_compiler.h"
-#include "rss_comms_atu.h"
+#include "rse_comms_atu.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -47,4 +47,4 @@
 }
 #endif
 
-#endif /* __RSS_COMMS_H__ */
+#endif /* __RSE_COMMS_H__ */
diff --git a/platform/ext/target/arm/rss/common/rss_comms/rss_comms_atu.c b/platform/ext/target/arm/rse/common/rse_comms/rse_comms_atu.c
similarity index 98%
rename from platform/ext/target/arm/rss/common/rss_comms/rss_comms_atu.c
rename to platform/ext/target/arm/rse/common/rse_comms/rse_comms_atu.c
index f68bffd..2cbafda 100644
--- a/platform/ext/target/arm/rss/common/rss_comms/rss_comms_atu.c
+++ b/platform/ext/target/arm/rse/common/rse_comms/rse_comms_atu.c
@@ -5,8 +5,8 @@
  *
  */
 
-#include "rss_comms_atu.h"
-#include "atu_rss_drv.h"
+#include "rse_comms_atu.h"
+#include "atu_rse_drv.h"
 #include "tfm_spm_log.h"
 #include "device_definition.h"
 #include "platform_base_address.h"
diff --git a/platform/ext/target/arm/rss/common/rss_comms/rss_comms_atu.h b/platform/ext/target/arm/rse/common/rse_comms/rse_comms_atu.h
similarity index 93%
rename from platform/ext/target/arm/rss/common/rss_comms/rss_comms_atu.h
rename to platform/ext/target/arm/rse/common/rse_comms/rse_comms_atu.h
index 27a1312..13f8d03 100644
--- a/platform/ext/target/arm/rss/common/rss_comms/rss_comms_atu.h
+++ b/platform/ext/target/arm/rse/common/rse_comms/rse_comms_atu.h
@@ -5,11 +5,11 @@
  *
  */
 
-#ifndef __RSS_COMMS_ATU_H__
-#define __RSS_COMMS_ATU_H__
+#ifndef __RSE_COMMS_ATU_H__
+#define __RSE_COMMS_ATU_H__
 
 #include "tfm_plat_defs.h"
-#include "rss_comms_atu_hal.h"
+#include "rse_comms_atu_hal.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -54,4 +54,4 @@
 }
 #endif
 
-#endif /* __RSS_COMMS_ATU_H__ */
+#endif /* __RSE_COMMS_ATU_H__ */
diff --git a/platform/ext/target/arm/rss/common/rss_comms/rss_comms_atu_hal.h b/platform/ext/target/arm/rse/common/rse_comms/rse_comms_atu_hal.h
similarity index 85%
rename from platform/ext/target/arm/rss/common/rss_comms/rss_comms_atu_hal.h
rename to platform/ext/target/arm/rse/common/rse_comms/rse_comms_atu_hal.h
index c1caa04..f709462 100644
--- a/platform/ext/target/arm/rss/common/rss_comms/rss_comms_atu_hal.h
+++ b/platform/ext/target/arm/rse/common/rse_comms/rse_comms_atu_hal.h
@@ -5,8 +5,8 @@
  *
  */
 
-#ifndef __RSS_COMMS_ATU_HAL_H__
-#define __RSS_COMMS_ATU_HAL_H__
+#ifndef __RSE_COMMS_ATU_HAL_H__
+#define __RSE_COMMS_ATU_HAL_H__
 
 #ifndef RSS_XIP
 #define RSS_COMMS_ATU_REGION_MIN        0
@@ -21,4 +21,4 @@
 #define RSS_COMMS_ATU_PAGE_SIZE         0x2000
 #define RSS_COMMS_ATU_REGION_SIZE       (RSS_COMMS_ATU_PAGE_SIZE * 8)
 
-#endif /* __RSS_COMMS_HAL_H__ */
+#endif /* __RSE_COMMS_HAL_H__ */
diff --git a/platform/ext/target/arm/rss/common/rss_comms/rss_comms_hal.c b/platform/ext/target/arm/rse/common/rse_comms/rse_comms_hal.c
similarity index 98%
rename from platform/ext/target/arm/rss/common/rss_comms/rss_comms_hal.c
rename to platform/ext/target/arm/rse/common/rse_comms/rse_comms_hal.c
index cddeb80..5e4ee3a 100644
--- a/platform/ext/target/arm/rss/common/rss_comms/rss_comms_hal.c
+++ b/platform/ext/target/arm/rse/common/rse_comms/rse_comms_hal.c
@@ -5,17 +5,17 @@
  *
  */
 
-#include "rss_comms_hal.h"
+#include "rse_comms_hal.h"
 
-#include "rss_comms.h"
-#include "rss_comms_queue.h"
+#include "rse_comms.h"
+#include "rse_comms_queue.h"
 #include "mhu.h"
 #include "cmsis.h"
 #include "device_definition.h"
 #include "tfm_peripherals_def.h"
 #include "tfm_spm_log.h"
 #include "tfm_pools.h"
-#include "rss_comms_protocol.h"
+#include "rse_comms_protocol.h"
 #include <string.h>
 
 /* Declared statically to avoid using huge amounts of stack space. Maybe revisit
diff --git a/platform/ext/target/arm/rss/common/rss_comms/rss_comms_hal.h b/platform/ext/target/arm/rse/common/rse_comms/rse_comms_hal.h
similarity index 93%
rename from platform/ext/target/arm/rss/common/rss_comms/rss_comms_hal.h
rename to platform/ext/target/arm/rse/common/rse_comms/rse_comms_hal.h
index 7140fca..c4676cb 100644
--- a/platform/ext/target/arm/rss/common/rss_comms/rss_comms_hal.h
+++ b/platform/ext/target/arm/rse/common/rse_comms/rse_comms_hal.h
@@ -5,10 +5,10 @@
  *
  */
 
-#ifndef __RSS_COMMS_HAL_H__
-#define __RSS_COMMS_HAL_H__
+#ifndef __RSE_COMMS_HAL_H__
+#define __RSE_COMMS_HAL_H__
 
-#include "rss_comms.h"
+#include "rse_comms.h"
 #include "tfm_plat_defs.h"
 
 #ifdef __cplusplus
@@ -53,4 +53,4 @@
 }
 #endif
 
-#endif /* __RSS_COMMS_HAL_H__ */
+#endif /* __RSE_COMMS_HAL_H__ */
diff --git a/platform/ext/target/arm/rss/common/rss_comms/rss_comms_permissions_hal.h b/platform/ext/target/arm/rse/common/rse_comms/rse_comms_permissions_hal.h
similarity index 92%
rename from platform/ext/target/arm/rss/common/rss_comms/rss_comms_permissions_hal.h
rename to platform/ext/target/arm/rse/common/rse_comms/rse_comms_permissions_hal.h
index 5220629..80c7fdc 100644
--- a/platform/ext/target/arm/rss/common/rss_comms/rss_comms_permissions_hal.h
+++ b/platform/ext/target/arm/rse/common/rse_comms/rse_comms_permissions_hal.h
@@ -5,12 +5,12 @@
  *
  */
 
-#ifndef __RSS_COMMS_PERMISSIONS_HAL_H__
-#define __RSS_COMMS_PERMISSIONS_HAL_H__
+#ifndef __RSE_COMMS_PERMISSIONS_HAL_H__
+#define __RSE_COMMS_PERMISSIONS_HAL_H__
 
 #include "psa/client.h"
 #include "tfm_plat_defs.h"
-#include "rss_comms_atu_hal.h"
+#include "rse_comms_atu_hal.h"
 #include "stdbool.h"
 
 #ifdef __cplusplus
@@ -56,4 +56,4 @@
 }
 #endif
 
-#endif /* __RSS_COMMS_PERMISSIONS_HAL_H__ */
+#endif /* __RSE_COMMS_PERMISSIONS_HAL_H__ */
diff --git a/platform/ext/target/arm/rss/common/rss_comms/rss_comms_protocol.c b/platform/ext/target/arm/rse/common/rse_comms/rse_comms_protocol.c
similarity index 98%
rename from platform/ext/target/arm/rss/common/rss_comms/rss_comms_protocol.c
rename to platform/ext/target/arm/rse/common/rse_comms/rse_comms_protocol.c
index 629baf0..51bb515 100644
--- a/platform/ext/target/arm/rss/common/rss_comms/rss_comms_protocol.c
+++ b/platform/ext/target/arm/rse/common/rse_comms/rse_comms_protocol.c
@@ -5,7 +5,7 @@
  *
  */
 
-#include "rss_comms_protocol.h"
+#include "rse_comms_protocol.h"
 
 #include "tfm_spm_log.h"
 #include <string.h>
diff --git a/platform/ext/target/arm/rss/common/rss_comms/rss_comms_protocol.h b/platform/ext/target/arm/rse/common/rse_comms/rse_comms_protocol.h
similarity index 94%
rename from platform/ext/target/arm/rss/common/rss_comms/rss_comms_protocol.h
rename to platform/ext/target/arm/rse/common/rse_comms/rse_comms_protocol.h
index 4c5d2cc..a1e0bf3 100644
--- a/platform/ext/target/arm/rss/common/rss_comms/rss_comms_protocol.h
+++ b/platform/ext/target/arm/rse/common/rse_comms/rse_comms_protocol.h
@@ -5,20 +5,20 @@
  *
  */
 
-#ifndef __RSS_COMMS_PROTOCOL_H__
-#define __RSS_COMMS_PROTOCOL_H__
+#ifndef __RSE_COMMS_PROTOCOL_H__
+#define __RSE_COMMS_PROTOCOL_H__
 
 #include "psa/client.h"
 #include "cmsis_compiler.h"
-#include "rss_comms.h"
+#include "rse_comms.h"
 #include "tfm_platform_system.h"
 
 #ifdef RSS_COMMS_PROTOCOL_EMBED_ENABLED
-#include "rss_comms_protocol_embed.h"
+#include "rse_comms_protocol_embed.h"
 #endif /* RSS_COMMS_PROTOCOL_EMBED_ENABLED */
 
 #ifdef RSS_COMMS_PROTOCOL_POINTER_ACCESS_ENABLED
-#include "rss_comms_protocol_pointer_access.h"
+#include "rse_comms_protocol_pointer_access.h"
 #endif /* RSS_MHU_PROTOCOL_V0_ENABLED */
 
 #ifdef __cplusplus
@@ -126,4 +126,4 @@
 }
 #endif
 
-#endif /* __RSS_COMMS_PROTOCOL_H__ */
+#endif /* __RSE_COMMS_PROTOCOL_H__ */
diff --git a/platform/ext/target/arm/rss/common/rss_comms/rss_comms_protocol_embed.c b/platform/ext/target/arm/rse/common/rse_comms/rse_comms_protocol_embed.c
similarity index 98%
rename from platform/ext/target/arm/rss/common/rss_comms/rss_comms_protocol_embed.c
rename to platform/ext/target/arm/rse/common/rse_comms/rse_comms_protocol_embed.c
index ae9255d..02b6cd5 100644
--- a/platform/ext/target/arm/rss/common/rss_comms/rss_comms_protocol_embed.c
+++ b/platform/ext/target/arm/rse/common/rse_comms/rse_comms_protocol_embed.c
@@ -5,7 +5,7 @@
  *
  */
 
-#include "rss_comms_protocol_embed.h"
+#include "rse_comms_protocol_embed.h"
 
 #include <string.h>
 
diff --git a/platform/ext/target/arm/rss/common/rss_comms/rss_comms_protocol_embed.h b/platform/ext/target/arm/rse/common/rse_comms/rse_comms_protocol_embed.h
similarity index 88%
rename from platform/ext/target/arm/rss/common/rss_comms/rss_comms_protocol_embed.h
rename to platform/ext/target/arm/rse/common/rse_comms/rse_comms_protocol_embed.h
index 1c00c92..2a9c7cb 100644
--- a/platform/ext/target/arm/rss/common/rss_comms/rss_comms_protocol_embed.h
+++ b/platform/ext/target/arm/rse/common/rse_comms/rse_comms_protocol_embed.h
@@ -5,12 +5,12 @@
  *
  */
 
-#ifndef __RSS_COMMS_PROTOCOL_EMBED_H__
-#define __RSS_COMMS_PROTOCOL_EMBED_H__
+#ifndef __RSE_COMMS_PROTOCOL_EMBED_H__
+#define __RSE_COMMS_PROTOCOL_EMBED_H__
 
 #include "psa/client.h"
 #include "cmsis_compiler.h"
-#include "rss_comms.h"
+#include "rse_comms.h"
 #include "tfm_platform_system.h"
 
 #ifdef __cplusplus
@@ -47,4 +47,4 @@
 }
 #endif
 
-#endif /* __RSS_COMMS_PROTOCOL_EMBED_H__ */
+#endif /* __RSE_COMMS_PROTOCOL_EMBED_H__ */
diff --git a/platform/ext/target/arm/rss/common/rss_comms/rss_comms_protocol_pointer_access.c b/platform/ext/target/arm/rse/common/rse_comms/rse_comms_protocol_pointer_access.c
similarity index 97%
rename from platform/ext/target/arm/rss/common/rss_comms/rss_comms_protocol_pointer_access.c
rename to platform/ext/target/arm/rse/common/rse_comms/rse_comms_protocol_pointer_access.c
index 6517365..b095670 100644
--- a/platform/ext/target/arm/rss/common/rss_comms/rss_comms_protocol_pointer_access.c
+++ b/platform/ext/target/arm/rse/common/rse_comms/rse_comms_protocol_pointer_access.c
@@ -5,10 +5,10 @@
  *
  */
 
-#include "rss_comms_protocol_pointer_access.h"
+#include "rse_comms_protocol_pointer_access.h"
 
 #include "tfm_psa_call_pack.h"
-#include "rss_comms_permissions_hal.h"
+#include "rse_comms_permissions_hal.h"
 
 enum tfm_plat_err_t rss_protocol_pointer_access_deserialize_msg(
         struct client_request_t *req,
diff --git a/platform/ext/target/arm/rss/common/rss_comms/rss_comms_protocol_pointer_access.h b/platform/ext/target/arm/rse/common/rse_comms/rse_comms_protocol_pointer_access.h
similarity index 86%
rename from platform/ext/target/arm/rss/common/rss_comms/rss_comms_protocol_pointer_access.h
rename to platform/ext/target/arm/rse/common/rse_comms/rse_comms_protocol_pointer_access.h
index 4696f4a..3d491b0 100644
--- a/platform/ext/target/arm/rss/common/rss_comms/rss_comms_protocol_pointer_access.h
+++ b/platform/ext/target/arm/rse/common/rse_comms/rse_comms_protocol_pointer_access.h
@@ -5,12 +5,12 @@
  *
  */
 
-#ifndef __RSS_COMMS_PROTOCOL_POINTER_ACCESS_H__
-#define __RSS_COMMS_PROTOCOL_POINTER_ACCESS_H__
+#ifndef __RSE_COMMS_PROTOCOL_POINTER_ACCESS_H__
+#define __RSE_COMMS_PROTOCOL_POINTER_ACCESS_H__
 
 #include "psa/client.h"
 #include "cmsis_compiler.h"
-#include "rss_comms.h"
+#include "rse_comms.h"
 #include "tfm_platform_system.h"
 
 #ifdef __cplusplus
@@ -48,4 +48,4 @@
 }
 #endif
 
-#endif /* __RSS_COMMS_PROTOCOL_POINTER_ACCESS_H__ */
+#endif /* __RSE_COMMS_PROTOCOL_POINTER_ACCESS_H__ */
diff --git a/platform/ext/target/arm/rss/common/rss_comms/rss_comms_queue.c b/platform/ext/target/arm/rse/common/rse_comms/rse_comms_queue.c
similarity index 96%
rename from platform/ext/target/arm/rss/common/rss_comms/rss_comms_queue.c
rename to platform/ext/target/arm/rse/common/rse_comms/rse_comms_queue.c
index 07867e1..b706a49 100644
--- a/platform/ext/target/arm/rss/common/rss_comms/rss_comms_queue.c
+++ b/platform/ext/target/arm/rse/common/rse_comms/rse_comms_queue.c
@@ -5,7 +5,7 @@
  *
  */
 
-#include "rss_comms_queue.h"
+#include "rse_comms_queue.h"
 
 #include <stdbool.h>
 #include <stddef.h>
diff --git a/platform/ext/target/arm/rss/common/rss_comms/rss_comms_queue.h b/platform/ext/target/arm/rse/common/rse_comms/rse_comms_queue.h
similarity index 74%
rename from platform/ext/target/arm/rss/common/rss_comms/rss_comms_queue.h
rename to platform/ext/target/arm/rse/common/rse_comms/rse_comms_queue.h
index 2864140..d3db1dd 100644
--- a/platform/ext/target/arm/rss/common/rss_comms/rss_comms_queue.h
+++ b/platform/ext/target/arm/rse/common/rse_comms/rse_comms_queue.h
@@ -5,8 +5,8 @@
  *
  */
 
-#ifndef __RSS_COMMS_QUEUE_H__
-#define __RSS_COMMS_QUEUE_H__
+#ifndef __RSE_COMMS_QUEUE_H__
+#define __RSE_COMMS_QUEUE_H__
 
 #include <stdint.h>
 
@@ -22,4 +22,4 @@
 }
 #endif
 
-#endif /* __RSS_COMMS_QUEUE_H__ */
+#endif /* __RSE_COMMS_QUEUE_H__ */
diff --git a/platform/ext/target/arm/rss/common/rss_handshake/CMakeLists.txt b/platform/ext/target/arm/rse/common/rse_handshake/CMakeLists.txt
similarity index 93%
rename from platform/ext/target/arm/rss/common/rss_handshake/CMakeLists.txt
rename to platform/ext/target/arm/rse/common/rse_handshake/CMakeLists.txt
index d3fdd67..55fa28b 100644
--- a/platform/ext/target/arm/rss/common/rss_handshake/CMakeLists.txt
+++ b/platform/ext/target/arm/rse/common/rse_handshake/CMakeLists.txt
@@ -12,6 +12,5 @@
 
 target_sources(platform_bl1_2
     PRIVATE
-        rss_handshake.c
+        rse_handshake.c
 )
-
diff --git a/platform/ext/target/arm/rss/common/rss_handshake/rss_handshake.c b/platform/ext/target/arm/rse/common/rse_handshake/rse_handshake.c
similarity index 98%
rename from platform/ext/target/arm/rss/common/rss_handshake/rss_handshake.c
rename to platform/ext/target/arm/rse/common/rse_handshake/rse_handshake.c
index d29a3b0..79bce07 100644
--- a/platform/ext/target/arm/rss/common/rss_handshake/rss_handshake.c
+++ b/platform/ext/target/arm/rse/common/rse_handshake/rse_handshake.c
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-#include "rss_handshake.h"
+#include "rse_handshake.h"
 #include "device_definition.h"
 #include "mhu.h"
 #include "tfm_plat_otp.h"
-#include "rss_key_derivation.h"
-#include "rss_kmu_slot_ids.h"
+#include "rse_key_derivation.h"
+#include "rse_kmu_slot_ids.h"
 #include "crypto.h"
 #include "cc3xx_aes.h"
 #include "cc3xx_rng.h"
diff --git a/platform/ext/target/arm/rss/common/rss_handshake/rss_handshake.h b/platform/ext/target/arm/rse/common/rse_handshake/rse_handshake.h
similarity index 87%
rename from platform/ext/target/arm/rss/common/rss_handshake/rss_handshake.h
rename to platform/ext/target/arm/rse/common/rse_handshake/rse_handshake.h
index d1cbc24..e6c119f 100644
--- a/platform/ext/target/arm/rss/common/rss_handshake/rss_handshake.h
+++ b/platform/ext/target/arm/rse/common/rse_handshake/rse_handshake.h
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#ifndef __RSS_HANDSHAKE_H__
-#define __RSS_HANDSHAKE_H__
+#ifndef __RSE_HANDSHAKE_H__
+#define __RSE_HANDSHAKE_H__
 
 #include <stdint.h>
 
 int32_t rss_handshake(void);
 
-#endif /* __RSS_HANDSHAKE_H__ */
+#endif /* __RSE_HANDSHAKE_H__ */
diff --git a/platform/ext/target/arm/rss/common/rss_key_derivation.c b/platform/ext/target/arm/rse/common/rse_key_derivation.c
similarity index 99%
rename from platform/ext/target/arm/rss/common/rss_key_derivation.c
rename to platform/ext/target/arm/rse/common/rse_key_derivation.c
index a360f0d..d828d75 100644
--- a/platform/ext/target/arm/rss/common/rss_key_derivation.c
+++ b/platform/ext/target/arm/rse/common/rse_key_derivation.c
@@ -5,7 +5,7 @@
  *
  */
 
-#include "rss_key_derivation.h"
+#include "rse_key_derivation.h"
 
 #include "device_definition.h"
 #include "tfm_plat_otp.h"
diff --git a/platform/ext/target/arm/rss/common/rss_key_derivation.h b/platform/ext/target/arm/rse/common/rse_key_derivation.h
similarity index 96%
rename from platform/ext/target/arm/rss/common/rss_key_derivation.h
rename to platform/ext/target/arm/rse/common/rse_key_derivation.h
index a029ec3..5bfd1b0 100644
--- a/platform/ext/target/arm/rss/common/rss_key_derivation.h
+++ b/platform/ext/target/arm/rse/common/rse_key_derivation.h
@@ -5,12 +5,12 @@
  *
  */
 
-#ifndef __RSS_KEY_DERIVATION_H__
-#define __RSS_KEY_DERIVATION_H__
+#ifndef __RSE_KEY_DERIVATION_H__
+#define __RSE_KEY_DERIVATION_H__
 
 #include <stdint.h>
 #include <stddef.h>
-#include "rss_kmu_slot_ids.h"
+#include "rse_kmu_slot_ids.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -121,4 +121,4 @@
 }
 #endif
 
-#endif /* __RSS_KEY_DERIVATION_H__ */
+#endif /* __RSE_KEY_DERIVATION_H__ */
diff --git a/platform/ext/target/arm/rss/common/rss_kmu_slot_ids.h b/platform/ext/target/arm/rse/common/rse_kmu_slot_ids.h
similarity index 93%
rename from platform/ext/target/arm/rss/common/rss_kmu_slot_ids.h
rename to platform/ext/target/arm/rse/common/rse_kmu_slot_ids.h
index 1d87996..e5802e5 100644
--- a/platform/ext/target/arm/rss/common/rss_kmu_slot_ids.h
+++ b/platform/ext/target/arm/rse/common/rse_kmu_slot_ids.h
@@ -5,8 +5,8 @@
  *
  */
 
-#ifndef __RSS_KMU_SLOT_IDS_H__
-#define __RSS_KMU_SLOT_IDS_H__
+#ifndef __RSE_KMU_SLOT_IDS_H__
+#define __RSE_KMU_SLOT_IDS_H__
 
 #include "kmu_drv.h"
 
@@ -50,4 +50,4 @@
 }
 #endif
 
-#endif /* __RSS_KMU_SLOT_IDS_H__ */
+#endif /* __RSE_KMU_SLOT_IDS_H__ */
diff --git a/platform/ext/target/arm/rss/common/rss_trng.c b/platform/ext/target/arm/rse/common/rse_trng.c
similarity index 100%
rename from platform/ext/target/arm/rss/common/rss_trng.c
rename to platform/ext/target/arm/rse/common/rse_trng.c
diff --git a/platform/ext/target/arm/rss/common/sam_interrupts.c b/platform/ext/target/arm/rse/common/sam_interrupts.c
similarity index 100%
rename from platform/ext/target/arm/rss/common/sam_interrupts.c
rename to platform/ext/target/arm/rse/common/sam_interrupts.c
diff --git a/platform/ext/target/arm/rss/common/services/src/tfm_platform_system.c b/platform/ext/target/arm/rse/common/services/src/tfm_platform_system.c
similarity index 100%
rename from platform/ext/target/arm/rss/common/services/src/tfm_platform_system.c
rename to platform/ext/target/arm/rse/common/services/src/tfm_platform_system.c
diff --git a/platform/ext/target/arm/rss/common/spm_dma_copy.c b/platform/ext/target/arm/rse/common/spm_dma_copy.c
similarity index 100%
rename from platform/ext/target/arm/rss/common/spm_dma_copy.c
rename to platform/ext/target/arm/rse/common/spm_dma_copy.c
diff --git a/platform/ext/target/arm/rss/common/target_cfg.c b/platform/ext/target/arm/rse/common/target_cfg.c
similarity index 100%
rename from platform/ext/target/arm/rss/common/target_cfg.c
rename to platform/ext/target/arm/rse/common/target_cfg.c
diff --git a/platform/ext/target/arm/rss/common/target_cfg.h b/platform/ext/target/arm/rse/common/target_cfg.h
similarity index 100%
rename from platform/ext/target/arm/rss/common/target_cfg.h
rename to platform/ext/target/arm/rse/common/target_cfg.h
diff --git a/platform/ext/target/arm/rss/common/tests/tfm_tests_config.cmake b/platform/ext/target/arm/rse/common/tests/tfm_tests_config.cmake
similarity index 100%
rename from platform/ext/target/arm/rss/common/tests/tfm_tests_config.cmake
rename to platform/ext/target/arm/rse/common/tests/tfm_tests_config.cmake
diff --git a/platform/ext/target/arm/rss/common/tfm_builtin_key_ids.h b/platform/ext/target/arm/rse/common/tfm_builtin_key_ids.h
similarity index 100%
rename from platform/ext/target/arm/rss/common/tfm_builtin_key_ids.h
rename to platform/ext/target/arm/rse/common/tfm_builtin_key_ids.h
diff --git a/platform/ext/target/arm/rss/common/tfm_hal_multi_core.c b/platform/ext/target/arm/rse/common/tfm_hal_multi_core.c
similarity index 100%
rename from platform/ext/target/arm/rss/common/tfm_hal_multi_core.c
rename to platform/ext/target/arm/rse/common/tfm_hal_multi_core.c
diff --git a/platform/ext/target/arm/rss/common/tfm_hal_platform.c b/platform/ext/target/arm/rse/common/tfm_hal_platform.c
similarity index 100%
rename from platform/ext/target/arm/rss/common/tfm_hal_platform.c
rename to platform/ext/target/arm/rse/common/tfm_hal_platform.c
diff --git a/platform/ext/target/arm/rss/common/tfm_hal_platform_reset.c b/platform/ext/target/arm/rse/common/tfm_hal_platform_reset.c
similarity index 100%
rename from platform/ext/target/arm/rss/common/tfm_hal_platform_reset.c
rename to platform/ext/target/arm/rse/common/tfm_hal_platform_reset.c
diff --git a/platform/ext/target/arm/rss/common/tfm_interrupts.c b/platform/ext/target/arm/rse/common/tfm_interrupts.c
similarity index 99%
rename from platform/ext/target/arm/rss/common/tfm_interrupts.c
rename to platform/ext/target/arm/rse/common/tfm_interrupts.c
index 5187ab8..41901ae 100644
--- a/platform/ext/target/arm/rss/common/tfm_interrupts.c
+++ b/platform/ext/target/arm/rse/common/tfm_interrupts.c
@@ -17,7 +17,7 @@
 #include "load/interrupt_defs.h"
 #include "platform_irq.h"
 #ifdef TFM_MULTI_CORE_TOPOLOGY
-#include "rss_comms_hal.h"
+#include "rse_comms_hal.h"
 #endif
 
 static struct irq_t timer0_irq = {0};
diff --git a/platform/ext/target/arm/rss/common/tfm_peripherals_def.c b/platform/ext/target/arm/rse/common/tfm_peripherals_def.c
similarity index 100%
rename from platform/ext/target/arm/rss/common/tfm_peripherals_def.c
rename to platform/ext/target/arm/rse/common/tfm_peripherals_def.c
diff --git a/platform/ext/target/arm/rss/common/tfm_peripherals_def.h b/platform/ext/target/arm/rse/common/tfm_peripherals_def.h
similarity index 100%
rename from platform/ext/target/arm/rss/common/tfm_peripherals_def.h
rename to platform/ext/target/arm/rse/common/tfm_peripherals_def.h
diff --git a/platform/ext/target/arm/rss/kronos/CMakeLists.txt b/platform/ext/target/arm/rse/kronos/CMakeLists.txt
similarity index 97%
rename from platform/ext/target/arm/rss/kronos/CMakeLists.txt
rename to platform/ext/target/arm/rse/kronos/CMakeLists.txt
index 6ac0f8e..5ef089b 100644
--- a/platform/ext/target/arm/rss/kronos/CMakeLists.txt
+++ b/platform/ext/target/arm/rse/kronos/CMakeLists.txt
@@ -27,7 +27,7 @@
         ${PLATFORM_DIR}/ext/target/arm/drivers/flash/strata/spi_strataflashj3_flash_lib.c
         $<$<NOT:$<BOOL:${RSS_DEBUG_UART}>>:${CMAKE_CURRENT_SOURCE_DIR}/cmsis_drivers/Driver_USART.c>
         $<$<NOT:$<BOOL:${RSS_DEBUG_UART}>>:${PLATFORM_DIR}/ext/target/arm/drivers/usart/pl011/uart_pl011_drv.c>
-        rss_comms/rss_comms_permissions_hal.c
+        rse_comms/rse_comms_permissions_hal.c
 )
 
 target_include_directories(platform_s
@@ -77,7 +77,7 @@
         $<$<NOT:$<BOOL:${RSS_DEBUG_UART}>>:${PLATFORM_DIR}/ext/target/arm/drivers/usart/pl011/uart_pl011_drv.c>
         ${PLATFORM_DIR}/ext/target/arm/drivers/flash/strata/spi_strataflashj3_flash_lib.c
         device/host_device_definition.c
-        $<$<BOOL:${RSS_ENABLE_BRINGUP_HELPERS}>:${CMAKE_CURRENT_SOURCE_DIR}/bl1/rss_bringup_helpers_hal.c>
+        $<$<BOOL:${RSS_ENABLE_BRINGUP_HELPERS}>:${CMAKE_CURRENT_SOURCE_DIR}/bl1/rse_bringup_helpers_hal.c>
 )
 
 target_include_directories(platform_bl1_1_interface
@@ -117,7 +117,7 @@
         DESTINATION ${INSTALL_PLATFORM_NS_DIR}
 )
 
-install(FILES       rss_memory_sizes.h
+install(FILES       rse_memory_sizes.h
                     flash_layout.h
                     host_base_address.h
         DESTINATION ${INSTALL_PLATFORM_NS_DIR}/partition)
diff --git a/platform/ext/target/arm/rss/kronos/bl1/rss_bringup_helpers_hal.c b/platform/ext/target/arm/rse/kronos/bl1/rse_bringup_helpers_hal.c
similarity index 93%
rename from platform/ext/target/arm/rss/kronos/bl1/rss_bringup_helpers_hal.c
rename to platform/ext/target/arm/rse/kronos/bl1/rse_bringup_helpers_hal.c
index 3e39a86..cc89b5c 100644
--- a/platform/ext/target/arm/rss/kronos/bl1/rss_bringup_helpers_hal.c
+++ b/platform/ext/target/arm/rse/kronos/bl1/rse_bringup_helpers_hal.c
@@ -5,7 +5,7 @@
  *
  */
 
-#include "rss_bringup_helpers_hal.h"
+#include "rse_bringup_helpers_hal.h"
 
 uint32_t rss_bringup_helpers_hal_get_pins_offset(void)
 {
diff --git a/platform/ext/target/arm/rss/kronos/bl2/bl2_image_id.h b/platform/ext/target/arm/rse/kronos/bl2/bl2_image_id.h
similarity index 100%
rename from platform/ext/target/arm/rss/kronos/bl2/bl2_image_id.h
rename to platform/ext/target/arm/rse/kronos/bl2/bl2_image_id.h
diff --git a/platform/ext/target/arm/rss/kronos/bl2/boot_hal_bl2.c b/platform/ext/target/arm/rse/kronos/bl2/boot_hal_bl2.c
similarity index 100%
rename from platform/ext/target/arm/rss/kronos/bl2/boot_hal_bl2.c
rename to platform/ext/target/arm/rse/kronos/bl2/boot_hal_bl2.c
diff --git a/platform/ext/target/arm/rss/kronos/bl2/flash_map_bl2.c b/platform/ext/target/arm/rse/kronos/bl2/flash_map_bl2.c
similarity index 100%
rename from platform/ext/target/arm/rss/kronos/bl2/flash_map_bl2.c
rename to platform/ext/target/arm/rse/kronos/bl2/flash_map_bl2.c
diff --git a/platform/ext/target/arm/rss/kronos/check_config.cmake b/platform/ext/target/arm/rse/kronos/check_config.cmake
similarity index 100%
rename from platform/ext/target/arm/rss/kronos/check_config.cmake
rename to platform/ext/target/arm/rse/kronos/check_config.cmake
diff --git a/platform/ext/target/arm/rss/kronos/cmsis_drivers/Driver_Flash.c b/platform/ext/target/arm/rse/kronos/cmsis_drivers/Driver_Flash.c
similarity index 100%
rename from platform/ext/target/arm/rss/kronos/cmsis_drivers/Driver_Flash.c
rename to platform/ext/target/arm/rse/kronos/cmsis_drivers/Driver_Flash.c
diff --git a/platform/ext/target/arm/rss/kronos/cmsis_drivers/Driver_USART.c b/platform/ext/target/arm/rse/kronos/cmsis_drivers/Driver_USART.c
similarity index 100%
rename from platform/ext/target/arm/rss/kronos/cmsis_drivers/Driver_USART.c
rename to platform/ext/target/arm/rse/kronos/cmsis_drivers/Driver_USART.c
diff --git a/platform/ext/target/arm/rss/kronos/cmsis_drivers/host_cmsis_driver_config.h b/platform/ext/target/arm/rse/kronos/cmsis_drivers/host_cmsis_driver_config.h
similarity index 100%
rename from platform/ext/target/arm/rss/kronos/cmsis_drivers/host_cmsis_driver_config.h
rename to platform/ext/target/arm/rse/kronos/cmsis_drivers/host_cmsis_driver_config.h
diff --git a/platform/ext/target/arm/rss/kronos/config.cmake b/platform/ext/target/arm/rse/kronos/config.cmake
similarity index 100%
rename from platform/ext/target/arm/rss/kronos/config.cmake
rename to platform/ext/target/arm/rse/kronos/config.cmake
diff --git a/platform/ext/target/arm/rss/kronos/config_tfm_target.h b/platform/ext/target/arm/rse/kronos/config_tfm_target.h
similarity index 100%
rename from platform/ext/target/arm/rss/kronos/config_tfm_target.h
rename to platform/ext/target/arm/rse/kronos/config_tfm_target.h
diff --git a/platform/ext/target/arm/rss/kronos/cpuarch.cmake b/platform/ext/target/arm/rse/kronos/cpuarch.cmake
similarity index 100%
rename from platform/ext/target/arm/rss/kronos/cpuarch.cmake
rename to platform/ext/target/arm/rse/kronos/cpuarch.cmake
diff --git a/platform/ext/target/arm/rss/kronos/device/host_device_cfg.h b/platform/ext/target/arm/rse/kronos/device/host_device_cfg.h
similarity index 100%
rename from platform/ext/target/arm/rss/kronos/device/host_device_cfg.h
rename to platform/ext/target/arm/rse/kronos/device/host_device_cfg.h
diff --git a/platform/ext/target/arm/rss/kronos/device/host_device_definition.c b/platform/ext/target/arm/rse/kronos/device/host_device_definition.c
similarity index 100%
rename from platform/ext/target/arm/rss/kronos/device/host_device_definition.c
rename to platform/ext/target/arm/rse/kronos/device/host_device_definition.c
diff --git a/platform/ext/target/arm/rss/kronos/device/host_device_definition.h b/platform/ext/target/arm/rse/kronos/device/host_device_definition.h
similarity index 100%
rename from platform/ext/target/arm/rss/kronos/device/host_device_definition.h
rename to platform/ext/target/arm/rse/kronos/device/host_device_definition.h
diff --git a/platform/ext/target/arm/rss/kronos/flash_layout.h b/platform/ext/target/arm/rse/kronos/flash_layout.h
similarity index 100%
rename from platform/ext/target/arm/rss/kronos/flash_layout.h
rename to platform/ext/target/arm/rse/kronos/flash_layout.h
diff --git a/platform/ext/target/arm/rss/kronos/host_base_address.h b/platform/ext/target/arm/rse/kronos/host_base_address.h
similarity index 100%
rename from platform/ext/target/arm/rss/kronos/host_base_address.h
rename to platform/ext/target/arm/rse/kronos/host_base_address.h
diff --git a/platform/ext/target/arm/rss/kronos/manifest/tfm_crypto.yaml b/platform/ext/target/arm/rse/kronos/manifest/tfm_crypto.yaml
similarity index 100%
rename from platform/ext/target/arm/rss/kronos/manifest/tfm_crypto.yaml
rename to platform/ext/target/arm/rse/kronos/manifest/tfm_crypto.yaml
diff --git a/platform/ext/target/arm/rss/kronos/manifest/tfm_manifest_list.yaml b/platform/ext/target/arm/rse/kronos/manifest/tfm_manifest_list.yaml
similarity index 95%
rename from platform/ext/target/arm/rss/kronos/manifest/tfm_manifest_list.yaml
rename to platform/ext/target/arm/rse/kronos/manifest/tfm_manifest_list.yaml
index 56d6c44..2fb2732 100644
--- a/platform/ext/target/arm/rss/kronos/manifest/tfm_manifest_list.yaml
+++ b/platform/ext/target/arm/rse/kronos/manifest/tfm_manifest_list.yaml
@@ -41,7 +41,7 @@
     },
     {
       "description": "Protected Storage Partition",
-      "manifest": "platform/ext/target/arm/rss/kronos/manifest/tfm_protected_storage.yaml",
+      "manifest": "platform/ext/target/arm/rse/kronos/manifest/tfm_protected_storage.yaml",
       "output_path": "secure_fw/partitions/protected_storage",
       "conditional": "TFM_PARTITION_PROTECTED_STORAGE",
       "version_major": 0,
@@ -55,7 +55,7 @@
     },
     {
       "description": "TFM Crypto Service",
-      "manifest": "platform/ext/target/arm/rss/kronos/manifest/tfm_crypto.yaml",
+      "manifest": "platform/ext/target/arm/rse/kronos/manifest/tfm_crypto.yaml",
       "output_path": "secure_fw/partitions/crypto",
       "conditional": "TFM_PARTITION_CRYPTO",
       "version_major": 0,
diff --git a/platform/ext/target/arm/rss/kronos/manifest/tfm_protected_storage.yaml b/platform/ext/target/arm/rse/kronos/manifest/tfm_protected_storage.yaml
similarity index 100%
rename from platform/ext/target/arm/rss/kronos/manifest/tfm_protected_storage.yaml
rename to platform/ext/target/arm/rse/kronos/manifest/tfm_protected_storage.yaml
diff --git a/platform/ext/target/arm/rss/kronos/ns/CMakeLists.txt b/platform/ext/target/arm/rse/kronos/ns/CMakeLists.txt
similarity index 100%
rename from platform/ext/target/arm/rss/kronos/ns/CMakeLists.txt
rename to platform/ext/target/arm/rse/kronos/ns/CMakeLists.txt
diff --git a/platform/ext/target/arm/rss/kronos/rss_comms/rss_comms_permissions_hal.c b/platform/ext/target/arm/rse/kronos/rse_comms/rse_comms_permissions_hal.c
similarity index 98%
rename from platform/ext/target/arm/rss/kronos/rss_comms/rss_comms_permissions_hal.c
rename to platform/ext/target/arm/rse/kronos/rse_comms/rse_comms_permissions_hal.c
index 0474a4a..c6f0793 100644
--- a/platform/ext/target/arm/rss/kronos/rss_comms/rss_comms_permissions_hal.c
+++ b/platform/ext/target/arm/rse/kronos/rse_comms/rse_comms_permissions_hal.c
@@ -5,7 +5,7 @@
  *
  */
 
-#include "rss_comms_permissions_hal.h"
+#include "rse_comms_permissions_hal.h"
 
 #include "psa_manifest/sid.h"
 #include "tfm_hal_platform.h"
diff --git a/platform/ext/target/arm/rss/kronos/rss_memory_sizes.h b/platform/ext/target/arm/rse/kronos/rse_memory_sizes.h
similarity index 94%
rename from platform/ext/target/arm/rss/kronos/rss_memory_sizes.h
rename to platform/ext/target/arm/rse/kronos/rse_memory_sizes.h
index d327cd9..8636227 100644
--- a/platform/ext/target/arm/rss/kronos/rss_memory_sizes.h
+++ b/platform/ext/target/arm/rse/kronos/rse_memory_sizes.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef __RSS_MEMORY_SIZES_H__
-#define __RSS_MEMORY_SIZES_H__
+#ifndef __RSE_MEMORY_SIZES_H__
+#define __RSE_MEMORY_SIZES_H__
 
 #ifdef RSS_XIP
 #define VM0_SIZE                         0x00010000 /* 64 KiB */
@@ -46,4 +46,4 @@
 /* The maximum size for secret values in the provisioning bundle */
 #define PROVISIONING_BUNDLE_VALUES_SIZE (0x3800)
 
-#endif /* __RSS_MEMORY_SIZES_H__ */
+#endif /* __RSE_MEMORY_SIZES_H__ */
diff --git a/platform/ext/target/arm/rss/kronos/tests/tfm_tests_config.cmake b/platform/ext/target/arm/rse/kronos/tests/tfm_tests_config.cmake
similarity index 100%
rename from platform/ext/target/arm/rss/kronos/tests/tfm_tests_config.cmake
rename to platform/ext/target/arm/rse/kronos/tests/tfm_tests_config.cmake
diff --git a/platform/ext/target/arm/rss/kronos/tests/tfm_tests_ns_config.cmake b/platform/ext/target/arm/rse/kronos/tests/tfm_tests_ns_config.cmake
similarity index 100%
rename from platform/ext/target/arm/rss/kronos/tests/tfm_tests_ns_config.cmake
rename to platform/ext/target/arm/rse/kronos/tests/tfm_tests_ns_config.cmake
diff --git a/platform/ext/target/arm/rss/rdfremont/CMakeLists.txt b/platform/ext/target/arm/rse/rdfremont/CMakeLists.txt
similarity index 94%
rename from platform/ext/target/arm/rss/rdfremont/CMakeLists.txt
rename to platform/ext/target/arm/rse/rdfremont/CMakeLists.txt
index dc48348..4684747 100644
--- a/platform/ext/target/arm/rss/rdfremont/CMakeLists.txt
+++ b/platform/ext/target/arm/rse/rdfremont/CMakeLists.txt
@@ -47,10 +47,10 @@
         ${PLATFORM_DIR}/ext/target/arm/drivers/flash/strata/spi_strataflashj3_flash_lib.c
         cmsis_drivers/Driver_USART.c
         device/host_device_definition.c
-        device/rss_expansion_device_definition.c
+        device/rse_expansion_device_definition.c
         ${PLATFORM_DIR}/ext/target/arm/drivers/usart/pl011/uart_pl011_drv.c
-        rss_expansion_peripherals_def.c
-        rss_comms/rss_comms_permissions_hal.c
+        rse_expansion_peripherals_def.c
+        rse_comms/rse_comms_permissions_hal.c
 )
 
 #========================= Platform BL2 =======================================#
@@ -64,7 +64,7 @@
         ${PLATFORM_DIR}/ext/target/arm/drivers/flash/strata/spi_strataflashj3_flash_lib.c
         cmsis_drivers/Driver_USART.c
         device/host_device_definition.c
-        device/rss_expansion_device_definition.c
+        device/rse_expansion_device_definition.c
         ${PLATFORM_DIR}/ext/target/arm/drivers/usart/pl011/uart_pl011_drv.c
 )
 
@@ -87,9 +87,9 @@
         ${PLATFORM_DIR}/ext/target/arm/drivers/flash/strata/spi_strataflashj3_flash_lib.c
         cmsis_drivers/Driver_USART.c
         device/host_device_definition.c
-        device/rss_expansion_device_definition.c
+        device/rse_expansion_device_definition.c
         ${PLATFORM_DIR}/ext/target/arm/drivers/usart/pl011/uart_pl011_drv.c
-        $<$<BOOL:${RSS_ENABLE_BRINGUP_HELPERS}>:${CMAKE_CURRENT_SOURCE_DIR}/bl1/rss_bringup_helpers_hal.c>
+        $<$<BOOL:${RSS_ENABLE_BRINGUP_HELPERS}>:${CMAKE_CURRENT_SOURCE_DIR}/bl1/rse_bringup_helpers_hal.c>
 )
 
 target_include_directories(platform_bl1_1_interface
diff --git a/platform/ext/target/arm/rss/kronos/bl1/rss_bringup_helpers_hal.c b/platform/ext/target/arm/rse/rdfremont/bl1/rse_bringup_helpers_hal.c
similarity index 93%
copy from platform/ext/target/arm/rss/kronos/bl1/rss_bringup_helpers_hal.c
copy to platform/ext/target/arm/rse/rdfremont/bl1/rse_bringup_helpers_hal.c
index 3e39a86..cc89b5c 100644
--- a/platform/ext/target/arm/rss/kronos/bl1/rss_bringup_helpers_hal.c
+++ b/platform/ext/target/arm/rse/rdfremont/bl1/rse_bringup_helpers_hal.c
@@ -5,7 +5,7 @@
  *
  */
 
-#include "rss_bringup_helpers_hal.h"
+#include "rse_bringup_helpers_hal.h"
 
 uint32_t rss_bringup_helpers_hal_get_pins_offset(void)
 {
diff --git a/platform/ext/target/arm/rss/rdfremont/bl2/boot_hal_bl2.c b/platform/ext/target/arm/rse/rdfremont/bl2/boot_hal_bl2.c
similarity index 100%
rename from platform/ext/target/arm/rss/rdfremont/bl2/boot_hal_bl2.c
rename to platform/ext/target/arm/rse/rdfremont/bl2/boot_hal_bl2.c
diff --git a/platform/ext/target/arm/rss/rdfremont/bl2/flash_map_bl2.c b/platform/ext/target/arm/rse/rdfremont/bl2/flash_map_bl2.c
similarity index 100%
rename from platform/ext/target/arm/rss/rdfremont/bl2/flash_map_bl2.c
rename to platform/ext/target/arm/rse/rdfremont/bl2/flash_map_bl2.c
diff --git a/platform/ext/target/arm/rss/rdfremont/bl2_image_id.h b/platform/ext/target/arm/rse/rdfremont/bl2_image_id.h
similarity index 100%
rename from platform/ext/target/arm/rss/rdfremont/bl2_image_id.h
rename to platform/ext/target/arm/rse/rdfremont/bl2_image_id.h
diff --git a/platform/ext/target/arm/rss/rdfremont/check_config.cmake b/platform/ext/target/arm/rse/rdfremont/check_config.cmake
similarity index 100%
rename from platform/ext/target/arm/rss/rdfremont/check_config.cmake
rename to platform/ext/target/arm/rse/rdfremont/check_config.cmake
diff --git a/platform/ext/target/arm/rss/rdfremont/cmsis_drivers/Driver_Flash.c b/platform/ext/target/arm/rse/rdfremont/cmsis_drivers/Driver_Flash.c
similarity index 100%
rename from platform/ext/target/arm/rss/rdfremont/cmsis_drivers/Driver_Flash.c
rename to platform/ext/target/arm/rse/rdfremont/cmsis_drivers/Driver_Flash.c
diff --git a/platform/ext/target/arm/rss/rdfremont/cmsis_drivers/Driver_USART.c b/platform/ext/target/arm/rse/rdfremont/cmsis_drivers/Driver_USART.c
similarity index 100%
rename from platform/ext/target/arm/rss/rdfremont/cmsis_drivers/Driver_USART.c
rename to platform/ext/target/arm/rse/rdfremont/cmsis_drivers/Driver_USART.c
diff --git a/platform/ext/target/arm/rss/rdfremont/cmsis_drivers/host_cmsis_driver_config.h b/platform/ext/target/arm/rse/rdfremont/cmsis_drivers/host_cmsis_driver_config.h
similarity index 100%
rename from platform/ext/target/arm/rss/rdfremont/cmsis_drivers/host_cmsis_driver_config.h
rename to platform/ext/target/arm/rse/rdfremont/cmsis_drivers/host_cmsis_driver_config.h
diff --git a/platform/ext/target/arm/rss/rdfremont/cmsis_drivers/rss_expansion_cmsis_driver_config.h b/platform/ext/target/arm/rse/rdfremont/cmsis_drivers/rse_expansion_cmsis_driver_config.h
similarity index 84%
rename from platform/ext/target/arm/rss/rdfremont/cmsis_drivers/rss_expansion_cmsis_driver_config.h
rename to platform/ext/target/arm/rse/rdfremont/cmsis_drivers/rse_expansion_cmsis_driver_config.h
index 7bd62b3..79df717 100644
--- a/platform/ext/target/arm/rss/rdfremont/cmsis_drivers/rss_expansion_cmsis_driver_config.h
+++ b/platform/ext/target/arm/rse/rdfremont/cmsis_drivers/rse_expansion_cmsis_driver_config.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef __RSS_EXPANSION_CMSIS_DRIVER_CONFIG_H__
-#define __RSS_EXPANSION_CMSIS_DRIVER_CONFIG_H__
+#ifndef __RSE_EXPANSION_CMSIS_DRIVER_CONFIG_H__
+#define __RSE_EXPANSION_CMSIS_DRIVER_CONFIG_H__
 
 #include "cmsis.h"
 #include "device_definition.h"
@@ -25,4 +25,4 @@
 
 #define FLASH0_DEV                   SPI_STRATAFLASHJ3_DEV
 
-#endif  /* __RSS_EXPANSION_CMSIS_DRIVER_CONFIG_H__ */
+#endif  /* __RSE_EXPANSION_CMSIS_DRIVER_CONFIG_H__ */
diff --git a/platform/ext/target/arm/rss/rdfremont/config.cmake b/platform/ext/target/arm/rse/rdfremont/config.cmake
similarity index 100%
rename from platform/ext/target/arm/rss/rdfremont/config.cmake
rename to platform/ext/target/arm/rse/rdfremont/config.cmake
diff --git a/platform/ext/target/arm/rss/rdfremont/config_tfm_target.h b/platform/ext/target/arm/rse/rdfremont/config_tfm_target.h
similarity index 100%
rename from platform/ext/target/arm/rss/rdfremont/config_tfm_target.h
rename to platform/ext/target/arm/rse/rdfremont/config_tfm_target.h
diff --git a/platform/ext/target/arm/rss/rdfremont/cpuarch.cmake b/platform/ext/target/arm/rse/rdfremont/cpuarch.cmake
similarity index 100%
rename from platform/ext/target/arm/rss/rdfremont/cpuarch.cmake
rename to platform/ext/target/arm/rse/rdfremont/cpuarch.cmake
diff --git a/platform/ext/target/arm/rss/rdfremont/device/host_device_cfg.h b/platform/ext/target/arm/rse/rdfremont/device/host_device_cfg.h
similarity index 100%
rename from platform/ext/target/arm/rss/rdfremont/device/host_device_cfg.h
rename to platform/ext/target/arm/rse/rdfremont/device/host_device_cfg.h
diff --git a/platform/ext/target/arm/rss/rdfremont/device/host_device_definition.c b/platform/ext/target/arm/rse/rdfremont/device/host_device_definition.c
similarity index 100%
rename from platform/ext/target/arm/rss/rdfremont/device/host_device_definition.c
rename to platform/ext/target/arm/rse/rdfremont/device/host_device_definition.c
diff --git a/platform/ext/target/arm/rss/rdfremont/device/host_device_definition.h b/platform/ext/target/arm/rse/rdfremont/device/host_device_definition.h
similarity index 100%
rename from platform/ext/target/arm/rss/rdfremont/device/host_device_definition.h
rename to platform/ext/target/arm/rse/rdfremont/device/host_device_definition.h
diff --git a/platform/ext/target/arm/rss/rdfremont/device/rss_expansion_device_cfg.h b/platform/ext/target/arm/rse/rdfremont/device/rse_expansion_device_cfg.h
similarity index 85%
rename from platform/ext/target/arm/rss/rdfremont/device/rss_expansion_device_cfg.h
rename to platform/ext/target/arm/rse/rdfremont/device/rse_expansion_device_cfg.h
index bf6504a..7c08323 100644
--- a/platform/ext/target/arm/rss/rdfremont/device/rss_expansion_device_cfg.h
+++ b/platform/ext/target/arm/rse/rdfremont/device/rse_expansion_device_cfg.h
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#ifndef __RSS_EXPANSION_DEVICE_CFG_H__
-#define __RSS_EXPANSION_DEVICE_CFG_H__
+#ifndef __RSE_EXPANSION_DEVICE_CFG_H__
+#define __RSE_EXPANSION_DEVICE_CFG_H__
 
 /**
- * \file  rss_expansion_device_cfg.h
+ * \file  rse_expansion_device_cfg.h
  * \brief This is the device configuration file with only used peripherals
  *        defined and configured via the secure and/or non-secure base address.
  */
@@ -34,4 +34,4 @@
 /* CFI Controller */
 #define CFI_S
 
-#endif  /* __RSS_EXPANSION_DEVICE_CFG_H__ */
+#endif  /* __RSE_EXPANSION_DEVICE_CFG_H__ */
diff --git a/platform/ext/target/arm/rss/rdfremont/device/rss_expansion_device_definition.c b/platform/ext/target/arm/rse/rdfremont/device/rse_expansion_device_definition.c
similarity index 95%
rename from platform/ext/target/arm/rss/rdfremont/device/rss_expansion_device_definition.c
rename to platform/ext/target/arm/rse/rdfremont/device/rse_expansion_device_definition.c
index 3702548..237b9e6 100644
--- a/platform/ext/target/arm/rss/rdfremont/device/rss_expansion_device_definition.c
+++ b/platform/ext/target/arm/rse/rdfremont/device/rse_expansion_device_definition.c
@@ -15,12 +15,12 @@
  */
 
 /**
- * \file  rss_expansion_device_definition.c
+ * \file  rse_expansion_device_definition.c
  * \brief This file defines exports the structures based on the peripheral
  *        definitions from device_cfg.h.
  */
 
-#include "rss_expansion_device_definition.h"
+#include "rse_expansion_device_definition.h"
 #include "platform_base_address.h"
 
 /* Arm UART PL011 driver structures */
diff --git a/platform/ext/target/arm/rss/rdfremont/device/rss_expansion_device_definition.h b/platform/ext/target/arm/rse/rdfremont/device/rse_expansion_device_definition.h
similarity index 83%
rename from platform/ext/target/arm/rss/rdfremont/device/rss_expansion_device_definition.h
rename to platform/ext/target/arm/rse/rdfremont/device/rse_expansion_device_definition.h
index 887ed72..1a54c55 100644
--- a/platform/ext/target/arm/rss/rdfremont/device/rss_expansion_device_definition.h
+++ b/platform/ext/target/arm/rse/rdfremont/device/rse_expansion_device_definition.h
@@ -15,15 +15,15 @@
  */
 
 /**
- * \file  rss_expansion_device_definition.h
+ * \file  rse_expansion_device_definition.h
  * \brief The structure definitions in this file are exported based on the
  *        peripheral definitions from device_cfg.h.
  */
 
-#ifndef __RSS_EXPANSION_DEVICE_DEFINITION_H__
-#define __RSS_EXPANSION_DEVICE_DEFINITION_H__
+#ifndef __RSE_EXPANSION_DEVICE_DEFINITION_H__
+#define __RSE_EXPANSION_DEVICE_DEFINITION_H__
 
-#include "rss_expansion_device_cfg.h"
+#include "rse_expansion_device_cfg.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -44,4 +44,4 @@
 }
 #endif
 
-#endif  /* __RSS_EXPANSION_DEVICE_DEFINITION_H__ */
+#endif  /* __RSE_EXPANSION_DEVICE_DEFINITION_H__ */
diff --git a/platform/ext/target/arm/rss/rdfremont/device/rss_expansion_regs.h b/platform/ext/target/arm/rse/rdfremont/device/rse_expansion_regs.h
similarity index 96%
rename from platform/ext/target/arm/rss/rdfremont/device/rss_expansion_regs.h
rename to platform/ext/target/arm/rse/rdfremont/device/rse_expansion_regs.h
index eb45433..f663ad1 100644
--- a/platform/ext/target/arm/rss/rdfremont/device/rss_expansion_regs.h
+++ b/platform/ext/target/arm/rse/rdfremont/device/rse_expansion_regs.h
@@ -5,8 +5,8 @@
 *
 */
 
-#ifndef __RSS_EXPANSION_REGS_H__
-#define __RSS_EXPANSION_REGS_H__
+#ifndef __RSE_EXPANSION_REGS_H__
+#define __RSE_EXPANSION_REGS_H__
 
 #include "cmsis.h"
 
@@ -79,4 +79,4 @@
 #define RSS_INTEG_ATU_AP_MCP_ATU_MSK   (0x1UL << RSS_INTEG_ATU_AP_MCP_ATU_POS)
 #define RSS_INTEG_ATU_AP_MCP_ATU       RSS_INTEG_ATU_AP_MCP_ATU_MSK
 
-#endif /* __RSS_EXPANSION_REGS_H__ */
+#endif /* __RSE_EXPANSION_REGS_H__ */
diff --git a/platform/ext/target/arm/rss/rdfremont/flash_layout.h b/platform/ext/target/arm/rse/rdfremont/flash_layout.h
similarity index 100%
rename from platform/ext/target/arm/rss/rdfremont/flash_layout.h
rename to platform/ext/target/arm/rse/rdfremont/flash_layout.h
diff --git a/platform/ext/target/arm/rss/rdfremont/host_base_address.h b/platform/ext/target/arm/rse/rdfremont/host_base_address.h
similarity index 100%
rename from platform/ext/target/arm/rss/rdfremont/host_base_address.h
rename to platform/ext/target/arm/rse/rdfremont/host_base_address.h
diff --git a/platform/ext/target/arm/rss/rdfremont/ns/CMakeLists.txt b/platform/ext/target/arm/rse/rdfremont/ns/CMakeLists.txt
similarity index 91%
rename from platform/ext/target/arm/rss/rdfremont/ns/CMakeLists.txt
rename to platform/ext/target/arm/rse/rdfremont/ns/CMakeLists.txt
index a23289e..2c19f4e 100644
--- a/platform/ext/target/arm/rss/rdfremont/ns/CMakeLists.txt
+++ b/platform/ext/target/arm/rse/rdfremont/ns/CMakeLists.txt
@@ -12,7 +12,7 @@
         cmsis_drivers/Driver_Flash.c
         cmsis_drivers/Driver_USART.c
         device/host_device_definition.c
-        device/rss_expansion_device_definition.c
+        device/rse_expansion_device_definition.c
         native_drivers/cfi_drv.c
         native_drivers/spi_strataflashj3_flash_lib.c
         native_drivers/uart_pl011_drv.c
diff --git a/platform/ext/target/arm/rss/rdfremont/rss_comms/rss_comms_permissions_hal.c b/platform/ext/target/arm/rse/rdfremont/rse_comms/rse_comms_permissions_hal.c
similarity index 98%
rename from platform/ext/target/arm/rss/rdfremont/rss_comms/rss_comms_permissions_hal.c
rename to platform/ext/target/arm/rse/rdfremont/rse_comms/rse_comms_permissions_hal.c
index 6d14afa..ee1f774 100644
--- a/platform/ext/target/arm/rss/rdfremont/rss_comms/rss_comms_permissions_hal.c
+++ b/platform/ext/target/arm/rse/rdfremont/rse_comms/rse_comms_permissions_hal.c
@@ -5,7 +5,7 @@
  *
  */
 
-#include "rss_comms_permissions_hal.h"
+#include "rse_comms_permissions_hal.h"
 
 #include "psa_manifest/sid.h"
 #include "tfm_hal_platform.h"
diff --git a/platform/ext/target/arm/rss/rdfremont/rss_expansion_base_address.h b/platform/ext/target/arm/rse/rdfremont/rse_expansion_base_address.h
similarity index 87%
rename from platform/ext/target/arm/rss/rdfremont/rss_expansion_base_address.h
rename to platform/ext/target/arm/rse/rdfremont/rse_expansion_base_address.h
index 1e700a7..53bc1f3 100644
--- a/platform/ext/target/arm/rss/rdfremont/rss_expansion_base_address.h
+++ b/platform/ext/target/arm/rse/rdfremont/rse_expansion_base_address.h
@@ -19,8 +19,8 @@
  * \brief This file defines all the peripheral base addresses for RSS platform.
  */
 
-#ifndef __RSS_EXPANSION_BASE_ADDRESS_H__
-#define __RSS_EXPANSION_BASE_ADDRESS_H__
+#ifndef __RSE_EXPANSION_BASE_ADDRESS_H__
+#define __RSE_EXPANSION_BASE_ADDRESS_H__
 
 /* RSS Integration Layer register block */
 #define RSS_INTEG_LAYER_BASE_S  0x58100000
@@ -29,4 +29,4 @@
 /* Boot flash */
 #define BOOT_FLASH_BASE_S       0xB0000000
 
-#endif  /* __RSS_EXPANSION_BASE_ADDRESS_H__ */
+#endif  /* __RSE_EXPANSION_BASE_ADDRESS_H__ */
diff --git a/platform/ext/target/arm/rss/rdfremont/rss_expansion_peripherals_def.c b/platform/ext/target/arm/rse/rdfremont/rse_expansion_peripherals_def.c
similarity index 100%
rename from platform/ext/target/arm/rss/rdfremont/rss_expansion_peripherals_def.c
rename to platform/ext/target/arm/rse/rdfremont/rse_expansion_peripherals_def.c
diff --git a/platform/ext/target/arm/rss/rdfremont/rss_memory_sizes.h b/platform/ext/target/arm/rse/rdfremont/rse_memory_sizes.h
similarity index 94%
rename from platform/ext/target/arm/rss/rdfremont/rss_memory_sizes.h
rename to platform/ext/target/arm/rse/rdfremont/rse_memory_sizes.h
index 2daa2b9..3c42393 100644
--- a/platform/ext/target/arm/rss/rdfremont/rss_memory_sizes.h
+++ b/platform/ext/target/arm/rse/rdfremont/rse_memory_sizes.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef __RSS_MEMORY_SIZES_H__
-#define __RSS_MEMORY_SIZES_H__
+#ifndef __RSE_MEMORY_SIZES_H__
+#define __RSE_MEMORY_SIZES_H__
 
 #define VM0_SIZE           0x80000 /* 512 KiB */
 #define VM1_SIZE           0x80000 /* 512 KiB */
@@ -44,4 +44,4 @@
 /* The maximum size for secret values in the provisioning bundle */
 #define PROVISIONING_BUNDLE_VALUES_SIZE (0x3E00)
 
-#endif /* __RSS_MEMORY_SIZES_H__ */
+#endif /* __RSE_MEMORY_SIZES_H__ */
diff --git a/platform/ext/target/arm/rss/rdfremont/size_defs.h b/platform/ext/target/arm/rse/rdfremont/size_defs.h
similarity index 100%
rename from platform/ext/target/arm/rss/rdfremont/size_defs.h
rename to platform/ext/target/arm/rse/rdfremont/size_defs.h
diff --git a/platform/ext/target/arm/rss/rdfremont/tests/tfm_tests_config.cmake b/platform/ext/target/arm/rse/rdfremont/tests/tfm_tests_config.cmake
similarity index 100%
rename from platform/ext/target/arm/rss/rdfremont/tests/tfm_tests_config.cmake
rename to platform/ext/target/arm/rse/rdfremont/tests/tfm_tests_config.cmake
diff --git a/platform/ext/target/arm/rss/rdfremont/tests/tfm_tests_ns_config.cmake b/platform/ext/target/arm/rse/rdfremont/tests/tfm_tests_ns_config.cmake
similarity index 100%
rename from platform/ext/target/arm/rss/rdfremont/tests/tfm_tests_ns_config.cmake
rename to platform/ext/target/arm/rse/rdfremont/tests/tfm_tests_ns_config.cmake
diff --git a/platform/ext/target/arm/rss/tc/CMakeLists.txt b/platform/ext/target/arm/rse/tc/CMakeLists.txt
similarity index 97%
rename from platform/ext/target/arm/rss/tc/CMakeLists.txt
rename to platform/ext/target/arm/rse/tc/CMakeLists.txt
index c6df98e..b26baf9 100644
--- a/platform/ext/target/arm/rss/tc/CMakeLists.txt
+++ b/platform/ext/target/arm/rse/tc/CMakeLists.txt
@@ -27,7 +27,7 @@
         ${PLATFORM_DIR}/ext/target/arm/drivers/flash/strata/spi_strataflashj3_flash_lib.c
         $<$<NOT:$<BOOL:${RSS_DEBUG_UART}>>:${CMAKE_CURRENT_SOURCE_DIR}/cmsis_drivers/Driver_USART.c>
         $<$<NOT:$<BOOL:${RSS_DEBUG_UART}>>:${PLATFORM_DIR}/ext/target/arm/drivers/usart/pl011/uart_pl011_drv.c>
-        rss_comms/rss_comms_permissions_hal.c
+        rse_comms/rse_comms_permissions_hal.c
 )
 
 target_include_directories(platform_s
@@ -77,7 +77,7 @@
         $<$<NOT:$<BOOL:${RSS_DEBUG_UART}>>:${PLATFORM_DIR}/ext/target/arm/drivers/usart/pl011/uart_pl011_drv.c>
         ${PLATFORM_DIR}/ext/target/arm/drivers/flash/strata/spi_strataflashj3_flash_lib.c
         device/host_device_definition.c
-        $<$<BOOL:${RSS_ENABLE_BRINGUP_HELPERS}>:${CMAKE_CURRENT_SOURCE_DIR}/bl1/rss_bringup_helpers_hal.c>
+        $<$<BOOL:${RSS_ENABLE_BRINGUP_HELPERS}>:${CMAKE_CURRENT_SOURCE_DIR}/bl1/rse_bringup_helpers_hal.c>
 )
 
 target_include_directories(platform_bl1_1_interface
@@ -117,7 +117,7 @@
         DESTINATION ${INSTALL_PLATFORM_NS_DIR}
 )
 
-install(FILES       rss_memory_sizes.h
+install(FILES       rse_memory_sizes.h
                     flash_layout.h
                     host_base_address.h
         DESTINATION ${INSTALL_PLATFORM_NS_DIR}/partition)
diff --git a/platform/ext/target/arm/rss/kronos/bl1/rss_bringup_helpers_hal.c b/platform/ext/target/arm/rse/tc/bl1/rse_bringup_helpers_hal.c
similarity index 93%
copy from platform/ext/target/arm/rss/kronos/bl1/rss_bringup_helpers_hal.c
copy to platform/ext/target/arm/rse/tc/bl1/rse_bringup_helpers_hal.c
index 3e39a86..cc89b5c 100644
--- a/platform/ext/target/arm/rss/kronos/bl1/rss_bringup_helpers_hal.c
+++ b/platform/ext/target/arm/rse/tc/bl1/rse_bringup_helpers_hal.c
@@ -5,7 +5,7 @@
  *
  */
 
-#include "rss_bringup_helpers_hal.h"
+#include "rse_bringup_helpers_hal.h"
 
 uint32_t rss_bringup_helpers_hal_get_pins_offset(void)
 {
diff --git a/platform/ext/target/arm/rss/tc/bl2/bl2_image_id.h b/platform/ext/target/arm/rse/tc/bl2/bl2_image_id.h
similarity index 100%
rename from platform/ext/target/arm/rss/tc/bl2/bl2_image_id.h
rename to platform/ext/target/arm/rse/tc/bl2/bl2_image_id.h
diff --git a/platform/ext/target/arm/rss/tc/bl2/boot_hal_bl2.c b/platform/ext/target/arm/rse/tc/bl2/boot_hal_bl2.c
similarity index 100%
rename from platform/ext/target/arm/rss/tc/bl2/boot_hal_bl2.c
rename to platform/ext/target/arm/rse/tc/bl2/boot_hal_bl2.c
diff --git a/platform/ext/target/arm/rss/tc/bl2/flash_map_bl2.c b/platform/ext/target/arm/rse/tc/bl2/flash_map_bl2.c
similarity index 100%
rename from platform/ext/target/arm/rss/tc/bl2/flash_map_bl2.c
rename to platform/ext/target/arm/rse/tc/bl2/flash_map_bl2.c
diff --git a/platform/ext/target/arm/rss/tc/check_config.cmake b/platform/ext/target/arm/rse/tc/check_config.cmake
similarity index 100%
rename from platform/ext/target/arm/rss/tc/check_config.cmake
rename to platform/ext/target/arm/rse/tc/check_config.cmake
diff --git a/platform/ext/target/arm/rss/tc/cmsis_drivers/Driver_Flash.c b/platform/ext/target/arm/rse/tc/cmsis_drivers/Driver_Flash.c
similarity index 100%
rename from platform/ext/target/arm/rss/tc/cmsis_drivers/Driver_Flash.c
rename to platform/ext/target/arm/rse/tc/cmsis_drivers/Driver_Flash.c
diff --git a/platform/ext/target/arm/rss/tc/cmsis_drivers/Driver_USART.c b/platform/ext/target/arm/rse/tc/cmsis_drivers/Driver_USART.c
similarity index 100%
rename from platform/ext/target/arm/rss/tc/cmsis_drivers/Driver_USART.c
rename to platform/ext/target/arm/rse/tc/cmsis_drivers/Driver_USART.c
diff --git a/platform/ext/target/arm/rss/tc/cmsis_drivers/host_cmsis_driver_config.h b/platform/ext/target/arm/rse/tc/cmsis_drivers/host_cmsis_driver_config.h
similarity index 100%
rename from platform/ext/target/arm/rss/tc/cmsis_drivers/host_cmsis_driver_config.h
rename to platform/ext/target/arm/rse/tc/cmsis_drivers/host_cmsis_driver_config.h
diff --git a/platform/ext/target/arm/rss/tc/config.cmake b/platform/ext/target/arm/rse/tc/config.cmake
similarity index 100%
rename from platform/ext/target/arm/rss/tc/config.cmake
rename to platform/ext/target/arm/rse/tc/config.cmake
diff --git a/platform/ext/target/arm/rss/tc/config_tfm_target.h b/platform/ext/target/arm/rse/tc/config_tfm_target.h
similarity index 100%
rename from platform/ext/target/arm/rss/tc/config_tfm_target.h
rename to platform/ext/target/arm/rse/tc/config_tfm_target.h
diff --git a/platform/ext/target/arm/rss/tc/cpuarch.cmake b/platform/ext/target/arm/rse/tc/cpuarch.cmake
similarity index 100%
rename from platform/ext/target/arm/rss/tc/cpuarch.cmake
rename to platform/ext/target/arm/rse/tc/cpuarch.cmake
diff --git a/platform/ext/target/arm/rss/tc/device/host_device_cfg.h b/platform/ext/target/arm/rse/tc/device/host_device_cfg.h
similarity index 100%
rename from platform/ext/target/arm/rss/tc/device/host_device_cfg.h
rename to platform/ext/target/arm/rse/tc/device/host_device_cfg.h
diff --git a/platform/ext/target/arm/rss/tc/device/host_device_definition.c b/platform/ext/target/arm/rse/tc/device/host_device_definition.c
similarity index 100%
rename from platform/ext/target/arm/rss/tc/device/host_device_definition.c
rename to platform/ext/target/arm/rse/tc/device/host_device_definition.c
diff --git a/platform/ext/target/arm/rss/tc/device/host_device_definition.h b/platform/ext/target/arm/rse/tc/device/host_device_definition.h
similarity index 100%
rename from platform/ext/target/arm/rss/tc/device/host_device_definition.h
rename to platform/ext/target/arm/rse/tc/device/host_device_definition.h
diff --git a/platform/ext/target/arm/rss/tc/flash_layout.h b/platform/ext/target/arm/rse/tc/flash_layout.h
similarity index 100%
rename from platform/ext/target/arm/rss/tc/flash_layout.h
rename to platform/ext/target/arm/rse/tc/flash_layout.h
diff --git a/platform/ext/target/arm/rss/tc/host_base_address.h b/platform/ext/target/arm/rse/tc/host_base_address.h
similarity index 100%
rename from platform/ext/target/arm/rss/tc/host_base_address.h
rename to platform/ext/target/arm/rse/tc/host_base_address.h
diff --git a/platform/ext/target/arm/rss/tc/ns/CMakeLists.txt b/platform/ext/target/arm/rse/tc/ns/CMakeLists.txt
similarity index 100%
rename from platform/ext/target/arm/rss/tc/ns/CMakeLists.txt
rename to platform/ext/target/arm/rse/tc/ns/CMakeLists.txt
diff --git a/platform/ext/target/arm/rss/tc/rss_comms/rss_comms_permissions_hal.c b/platform/ext/target/arm/rse/tc/rse_comms/rse_comms_permissions_hal.c
similarity index 98%
rename from platform/ext/target/arm/rss/tc/rss_comms/rss_comms_permissions_hal.c
rename to platform/ext/target/arm/rse/tc/rse_comms/rse_comms_permissions_hal.c
index 6f0b288..112d895 100644
--- a/platform/ext/target/arm/rss/tc/rss_comms/rss_comms_permissions_hal.c
+++ b/platform/ext/target/arm/rse/tc/rse_comms/rse_comms_permissions_hal.c
@@ -5,7 +5,7 @@
  *
  */
 
-#include "rss_comms_permissions_hal.h"
+#include "rse_comms_permissions_hal.h"
 
 #include "device_definition.h"
 #include "psa_manifest/sid.h"
diff --git a/platform/ext/target/arm/rss/kronos/rss_memory_sizes.h b/platform/ext/target/arm/rse/tc/rse_memory_sizes.h
similarity index 94%
copy from platform/ext/target/arm/rss/kronos/rss_memory_sizes.h
copy to platform/ext/target/arm/rse/tc/rse_memory_sizes.h
index d327cd9..8636227 100644
--- a/platform/ext/target/arm/rss/kronos/rss_memory_sizes.h
+++ b/platform/ext/target/arm/rse/tc/rse_memory_sizes.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef __RSS_MEMORY_SIZES_H__
-#define __RSS_MEMORY_SIZES_H__
+#ifndef __RSE_MEMORY_SIZES_H__
+#define __RSE_MEMORY_SIZES_H__
 
 #ifdef RSS_XIP
 #define VM0_SIZE                         0x00010000 /* 64 KiB */
@@ -46,4 +46,4 @@
 /* The maximum size for secret values in the provisioning bundle */
 #define PROVISIONING_BUNDLE_VALUES_SIZE (0x3800)
 
-#endif /* __RSS_MEMORY_SIZES_H__ */
+#endif /* __RSE_MEMORY_SIZES_H__ */
diff --git a/platform/ext/target/arm/rss/tc/tests/tfm_tests_config.cmake b/platform/ext/target/arm/rse/tc/tests/tfm_tests_config.cmake
similarity index 100%
rename from platform/ext/target/arm/rss/tc/tests/tfm_tests_config.cmake
rename to platform/ext/target/arm/rse/tc/tests/tfm_tests_config.cmake
diff --git a/platform/ext/target/arm/rss/tc/tests/tfm_tests_ns_config.cmake b/platform/ext/target/arm/rse/tc/tests/tfm_tests_ns_config.cmake
similarity index 100%
rename from platform/ext/target/arm/rss/tc/tests/tfm_tests_ns_config.cmake
rename to platform/ext/target/arm/rse/tc/tests/tfm_tests_ns_config.cmake
diff --git a/platform/ext/target/arm/rss/rdfremont/bl1/rss_bringup_helpers_hal.c b/platform/ext/target/arm/rss/rdfremont/bl1/rss_bringup_helpers_hal.c
deleted file mode 100644
index 3e39a86..0000000
--- a/platform/ext/target/arm/rss/rdfremont/bl1/rss_bringup_helpers_hal.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2023-2024, Arm Limited. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- *
- */
-
-#include "rss_bringup_helpers_hal.h"
-
-uint32_t rss_bringup_helpers_hal_get_pins_offset(void)
-{
-    /* FIXME set this properly */
-    return 0;
-}
-
-void *rss_bringup_helpers_hal_get_vm0_exec_address(void)
-{
-    /* FIXME set this properly */
-    return VM0_BASE_S;
-}
-
-void *rss_bringup_helpers_hal_get_qpsi_exec_address(void)
-{
-    /* FIXME set this properly */
-    return FLASH_BASE_ADDRESS;
-}
-
-void *rss_bringup_helpers_hal_get_side_band_exec_address(void)
-{
-    /* FIXME set this properly */
-    return 0;
-}
diff --git a/platform/ext/target/arm/rss/tc/bl1/rss_bringup_helpers_hal.c b/platform/ext/target/arm/rss/tc/bl1/rss_bringup_helpers_hal.c
deleted file mode 100644
index 3e39a86..0000000
--- a/platform/ext/target/arm/rss/tc/bl1/rss_bringup_helpers_hal.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2023-2024, Arm Limited. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- *
- */
-
-#include "rss_bringup_helpers_hal.h"
-
-uint32_t rss_bringup_helpers_hal_get_pins_offset(void)
-{
-    /* FIXME set this properly */
-    return 0;
-}
-
-void *rss_bringup_helpers_hal_get_vm0_exec_address(void)
-{
-    /* FIXME set this properly */
-    return VM0_BASE_S;
-}
-
-void *rss_bringup_helpers_hal_get_qpsi_exec_address(void)
-{
-    /* FIXME set this properly */
-    return FLASH_BASE_ADDRESS;
-}
-
-void *rss_bringup_helpers_hal_get_side_band_exec_address(void)
-{
-    /* FIXME set this properly */
-    return 0;
-}
diff --git a/platform/ext/target/arm/rss/tc/rss_memory_sizes.h b/platform/ext/target/arm/rss/tc/rss_memory_sizes.h
deleted file mode 100644
index d327cd9..0000000
--- a/platform/ext/target/arm/rss/tc/rss_memory_sizes.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2022-2024, Arm Limited. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __RSS_MEMORY_SIZES_H__
-#define __RSS_MEMORY_SIZES_H__
-
-#ifdef RSS_XIP
-#define VM0_SIZE                         0x00010000 /* 64 KiB */
-#define VM1_SIZE                         0x00010000 /* 64 KiB */
-#else
-#define VM0_SIZE                         0x00080000 /* 512 KiB */
-#define VM1_SIZE                         0x00080000 /* 512 KiB */
-#endif /* RSS_XIP */
-
-/* The total size of the OTP for the RSS */
-#define OTP_TOTAL_SIZE     (0x4000)
-/* How much OTP is reserved for the portion of the DMA Initial Command Sequence
- * which is located in OTP. This is loaded by directly by the DMA hardware, so
- * this must match the size configured into the ROM part of the ICS.
- */
-#define OTP_DMA_ICS_SIZE   (0x400)
-/* How much space in ROM is used for the DMA Initial Command Sequence */
-#define ROM_DMA_ICS_SIZE   (0x1000)
-
-/* How much space in OTP can be used for the SAM configuration */
-#define OTP_SAM_CONFIGURATION_SIZE 0x60
-
-/* How much space in OTP can be used for the SCP data */
-#define OTP_SCP_DATA_SIZE 0x1000
-
-/* The maximum size for code in the provisioning bundle */
-#define PROVISIONING_BUNDLE_CODE_SIZE   (0xB000)
-/* The maximum size for secret values in the provisioning bundle */
-#define PROVISIONING_BUNDLE_VALUES_SIZE (0x3800)
-
-#endif /* __RSS_MEMORY_SIZES_H__ */