diff --git a/docs/user_guides/services/tfm_attestation_integration_guide.rst b/docs/user_guides/services/tfm_attestation_integration_guide.rst
index 5224dbd..a29c08c 100644
--- a/docs/user_guides/services/tfm_attestation_integration_guide.rst
+++ b/docs/user_guides/services/tfm_attestation_integration_guide.rst
@@ -123,7 +123,7 @@
 **************
 The PSA interface for the Initial Attestation Service is located in
 ``interface/include``. The only header to be included by applications that want
-to use functions from the PSA API is ``psa_initial_attestation.h``.
+to use functions from the PSA API is ``psa/initial_attestation.h``.
 
 The TF-M Initial Attestation Service source files are located in
 ``secure_fw/services/initial_attestation``.
@@ -148,14 +148,14 @@
     - ``lib/t_cose/src/t_cose_crypto.h``: Expose an API to bind ``t_cose``
       library with available crypto library in the device.
     - ``lib/t_cose/src/t_cose_psa_crypto.c``: Implements the exposed API
-      and ports ``t_cose`` to psa_crypto library.
+      and ports ``t_cose`` to the PSA Crypto API.
     - Initial Attestation Service:
         - ``attestation_core.c`` : Implements core functionalities such as
           implementation of APIs, retrieval of claims and token creation.
         - ``attest_token.c``: Implements the token creation function such as
           start and finish token creation and adding claims to the token.
         - ``attestation_key.c``: Get the attestation key from platform layer
-          and register it to psa_crypto service for further usage.
+          and register it to the TF-M Crypto service for further usage.
         - ``tfm_attestation.c``: Implements the SPM abstraction layer, and bind
           the attestation service to the SPM implementation in TF-M project.
         - ``tfm_attestation_secure_api.c``: Implements the secure API layer to
@@ -184,7 +184,7 @@
     - ``attestation.h``: Expose an API to bind attestation service to an SPM
       implementation.
 - **PSA interface**:
-    - ``psa_initial_attestation.h``: Public API definition of initial
+    - ``psa/initial_attestation.h``: Public API definition of initial
       attestation service.
 - **Crypto interface**:
     - ``t_cose_crypto.h``: Expose an API to bind the ``t_cose`` implementation
diff --git a/docs/user_guides/services/tfm_crypto_integration_guide.rst b/docs/user_guides/services/tfm_crypto_integration_guide.rst
index 4ff06ea..0241c35 100644
--- a/docs/user_guides/services/tfm_crypto_integration_guide.rst
+++ b/docs/user_guides/services/tfm_crypto_integration_guide.rst
@@ -14,17 +14,17 @@
 **************
 The PSA interfaces for the Crypto service are located in ``interface\include``.
 The only header to be included by applications that want to use functions from
-the PSA API is ``psa_crypto.h``.
+the PSA API is ``psa/crypto.h``.
 The TF-M Crypto service source files are located in
 ``secure_fw\services\crypto``.
 
 PSA interfaces
 ==============
 The TF-M Crypto service exposes the PSA interfaces detailed in the header
-``psa_crypto.h``. This header, in turn, includes several other headers which
+``psa/crypto.h``. This header, in turn, includes several other headers which
 are not meant to be included directly by user applications. For a detailed
 description of the PSA API interface, please refer to the comments in the
-``psa_crypto.h`` header itself.
+``psa/crypto.h`` header itself.
 
 Service source files
 ====================
@@ -67,7 +67,7 @@
 functionalities exported by the PSA Crypto interface is given, with particular
 focus on the TF-M Crypto service specific operations. For the details of the
 generic PSA Crypto interface operations, please refer directly to the header
-``psa_crypto.h``.
+``psa/crypto.h``.
 
 Most of the PSA Crypto multipart APIs require an operation context to be
 allocated by the application and then to be passed as a pointer during the
@@ -80,7 +80,7 @@
 - ``psa_cipher_operation_t`` - Operation context for multipart cipher operations
 
 The user applications are not allowed to make any assumption about the original
-types behind these typedefs, which are defined inside ``psa_crypto.h``.
+types behind these typedefs, which are defined inside ``psa/crypto.h``.
 In the scope of the TF-M Crypto service, these types are regarded as handles to
 the corresponding implementation defined structures which are stored in the
 Secure world.
diff --git a/docs/user_guides/services/tfm_sst_integration_guide.rst b/docs/user_guides/services/tfm_sst_integration_guide.rst
index 5fd2a31..8d4273e 100644
--- a/docs/user_guides/services/tfm_sst_integration_guide.rst
+++ b/docs/user_guides/services/tfm_sst_integration_guide.rst
@@ -121,7 +121,7 @@
 For the moment, it does not support the extended version of those APIs.
 
 These PSA PS interfaces and SST TF-M types are defined and documented in
-``interface/include/psa_protected_storage.h`` and
+``interface/include/psa/protected_storage.h`` and
 ``interface/include/tfm_sst_defs.h``
 
 Core Files
diff --git a/interface/include/psa_client.h b/interface/include/psa/client.h
similarity index 100%
rename from interface/include/psa_client.h
rename to interface/include/psa/client.h
diff --git a/interface/include/psa_crypto.h b/interface/include/psa/crypto.h
similarity index 99%
rename from interface/include/psa_crypto.h
rename to interface/include/psa/crypto.h
index 35acbc1..1e0c9d0 100644
--- a/interface/include/psa_crypto.h
+++ b/interface/include/psa/crypto.h
@@ -5,14 +5,14 @@
  *
  */
 /**
- * \file psa_crypto.h
+ * \file psa/crypto.h
  * \brief Platform Security Architecture cryptography module
  */
 
 #ifndef PSA_CRYPTO_H
 #define PSA_CRYPTO_H
 
-#include "psa_crypto_platform.h"
+#include "psa/crypto_platform.h"
 
 #include <stddef.h>
 
@@ -45,11 +45,11 @@
 
 /* The file "crypto_types.h" declares types that encode errors,
  * algorithms, key types, policies, etc. */
-#include "psa_crypto_types.h"
+#include "psa/crypto_types.h"
 
 /* The file "crypto_values.h" declares macros to build and analyze values
  * of integral types defined in "crypto_types.h". */
-#include "psa_crypto_values.h"
+#include "psa/crypto_values.h"
 
 /** \defgroup initialization Library initialization
  * @{
@@ -2365,14 +2365,14 @@
 
 /* The file "crypto_sizes.h" contains definitions for size calculation
  * macros whose definitions are implementation-specific. */
-#include "psa_crypto_sizes.h"
+#include "psa/crypto_sizes.h"
 
 /* The file "crypto_struct.h" contains definitions for
  * implementation-specific structs that are declared above. */
-#include "psa_crypto_struct.h"
+#include "psa/crypto_struct.h"
 
 /* The file "crypto_extra.h" contains vendor-specific definitions. This
  * can include vendor-defined algorithms, extra functions, etc. */
-#include "psa_crypto_extra.h"
+#include "psa/crypto_extra.h"
 
 #endif /* PSA_CRYPTO_H */
diff --git a/interface/include/psa_crypto_extra.h b/interface/include/psa/crypto_extra.h
similarity index 91%
rename from interface/include/psa_crypto_extra.h
rename to interface/include/psa/crypto_extra.h
index 7c8ba5f..3f08fa7 100644
--- a/interface/include/psa_crypto_extra.h
+++ b/interface/include/psa/crypto_extra.h
@@ -5,12 +5,12 @@
  *
  */
 /**
- * \file psa_crypto_extra.h
+ * \file psa/crypto_extra.h
  *
  * \brief PSA cryptography module: vendor extensions
  *
  * \note This file may not be included directly. Applications must
- * include psa_crypto.h.
+ * include psa/crypto.h.
  *
  * This file is reserved for vendor-specific definitions.
  */
diff --git a/interface/include/psa_crypto_platform.h b/interface/include/psa/crypto_platform.h
similarity index 93%
rename from interface/include/psa_crypto_platform.h
rename to interface/include/psa/crypto_platform.h
index 5033471..c5def6f 100644
--- a/interface/include/psa_crypto_platform.h
+++ b/interface/include/psa/crypto_platform.h
@@ -5,12 +5,12 @@
  *
  */
 /**
- * \file psa_crypto_platform.h
+ * \file psa/crypto_platform.h
  *
  * \brief PSA cryptography module: platform definitions
  *
  * \note This file may not be included directly. Applications must
- * include psa_crypto.h.
+ * include psa/crypto.h.
  *
  * This file contains platform-dependent type definitions.
  *
diff --git a/interface/include/psa_crypto_sizes.h b/interface/include/psa/crypto_sizes.h
similarity index 99%
rename from interface/include/psa_crypto_sizes.h
rename to interface/include/psa/crypto_sizes.h
index f0983b0..4c62239 100644
--- a/interface/include/psa_crypto_sizes.h
+++ b/interface/include/psa/crypto_sizes.h
@@ -5,12 +5,12 @@
  *
  */
 /**
- * \file psa_crypto_sizes.h
+ * \file psa/crypto_sizes.h
  *
  * \brief PSA cryptography module: buffer size macros
  *
  * \note This file may not be included directly. Applications must
- * include psa_crypto.h.
+ * include psa/crypto.h.
  *
  * This file contains the definitions of macros that are useful to
  * compute buffer sizes. The signatures and semantics of these macros
diff --git a/interface/include/psa_crypto_struct.h b/interface/include/psa/crypto_struct.h
similarity index 96%
rename from interface/include/psa_crypto_struct.h
rename to interface/include/psa/crypto_struct.h
index 8e252a0..3502bdc 100644
--- a/interface/include/psa_crypto_struct.h
+++ b/interface/include/psa/crypto_struct.h
@@ -5,12 +5,12 @@
  *
  */
 /**
- * \file psa_crypto_struct.h
+ * \file psa/crypto_struct.h
  *
  * \brief PSA cryptography module: structured type implementations
  *
  * \note This file may not be included directly. Applications must
- * include psa_crypto.h.
+ * include psa/crypto.h.
  *
  * This file contains the definitions of some data structures with
  * implementation-specific definitions.
diff --git a/interface/include/psa_crypto_types.h b/interface/include/psa/crypto_types.h
similarity index 95%
rename from interface/include/psa_crypto_types.h
rename to interface/include/psa/crypto_types.h
index 58c3523..bf5b824 100644
--- a/interface/include/psa_crypto_types.h
+++ b/interface/include/psa/crypto_types.h
@@ -5,12 +5,12 @@
  *
  */
 /**
- * \file psa_crypto_types.h
+ * \file psa/crypto_types.h
  *
  * \brief PSA cryptography module: type aliases.
  *
  * \note This file may not be included directly. Applications must
- * include psa_crypto.h. Drivers must include the appropriate driver
+ * include psa/crypto.h. Drivers must include the appropriate driver
  * header file.
  *
  * This file contains portable definitions of integral types for properties
diff --git a/interface/include/psa_crypto_values.h b/interface/include/psa/crypto_values.h
similarity index 99%
rename from interface/include/psa_crypto_values.h
rename to interface/include/psa/crypto_values.h
index d564334..315cd10 100644
--- a/interface/include/psa_crypto_values.h
+++ b/interface/include/psa/crypto_values.h
@@ -5,12 +5,12 @@
  *
  */
 /**
- * \file psa_crypto_values.h
+ * \file psa/crypto_values.h
  *
  * \brief PSA cryptography module: macros to build and analyze integer values.
  *
  * \note This file may not be included directly. Applications must
- * include psa_crypto.h. Drivers must include the appropriate driver
+ * include psa/crypto.h. Drivers must include the appropriate driver
  * header file.
  *
  * This file contains portable definitions of macros to build and analyze
diff --git a/interface/include/psa_initial_attestation_api.h b/interface/include/psa/initial_attestation.h
similarity index 98%
rename from interface/include/psa_initial_attestation_api.h
rename to interface/include/psa/initial_attestation.h
index 1a7636f..133c6dd 100644
--- a/interface/include/psa_initial_attestation_api.h
+++ b/interface/include/psa/initial_attestation.h
@@ -12,8 +12,8 @@
 /*   to a stable set of APIs once all the feedback has been considered.    */
 /***************************************************************************/
 
-#ifndef __PSA_INITIAL_ATTESTATION_API_H__
-#define __PSA_INITIAL_ATTESTATION_API_H__
+#ifndef __PSA_INITIAL_ATTESTATION_H__
+#define __PSA_INITIAL_ATTESTATION_H__
 
 #include <limits.h>
 #include <stdint.h>
@@ -225,4 +225,4 @@
 }
 #endif
 
-#endif /* __PSA_INITIAL_ATTESTATION_API_H__ */
+#endif /* __PSA_INITIAL_ATTESTATION_H__ */
diff --git a/interface/include/psa_protected_storage.h b/interface/include/psa/protected_storage.h
similarity index 100%
rename from interface/include/psa_protected_storage.h
rename to interface/include/psa/protected_storage.h
diff --git a/interface/include/psa_service.h b/interface/include/psa/service.h
similarity index 99%
rename from interface/include/psa_service.h
rename to interface/include/psa/service.h
index e72d0df..2e8558a 100644
--- a/interface/include/psa_service.h
+++ b/interface/include/psa/service.h
@@ -14,7 +14,7 @@
 
 #include <inttypes.h>
 
-#include "psa_client.h"
+#include "psa/client.h"
 
 /********************** PSA Secure Partition Macros and Types ****************/
 
diff --git a/interface/include/tfm_api.h b/interface/include/tfm_api.h
index 8e152ff..5a56ec7 100644
--- a/interface/include/tfm_api.h
+++ b/interface/include/tfm_api.h
@@ -13,7 +13,7 @@
 #endif
 
 #include <stdint.h>
-#include "psa_client.h"
+#include "psa/client.h"
 
 #define TFM_INVALID_CLIENT_ID 0
 
diff --git a/interface/include/tfm_crypto_defs.h b/interface/include/tfm_crypto_defs.h
index 23154a6..f5fd674 100644
--- a/interface/include/tfm_crypto_defs.h
+++ b/interface/include/tfm_crypto_defs.h
@@ -15,7 +15,7 @@
 #include <stdint.h>
 #include <limits.h>
 #include "tfm_api.h"
-#include "psa_crypto.h"
+#include "psa/crypto.h"
 
 /**
  * \brief This type is used to overcome a limitation in the number of maximum
diff --git a/interface/src/tfm_crypto_api.c b/interface/src/tfm_crypto_api.c
index a4cddbf..19bc52c 100644
--- a/interface/src/tfm_crypto_api.c
+++ b/interface/src/tfm_crypto_api.c
@@ -7,13 +7,13 @@
 
 #include "tfm_veneers.h"
 #include "tfm_crypto_defs.h"
-#include "psa_crypto.h"
+#include "psa/crypto.h"
 #include "tfm_ns_lock.h"
 
 #define ARRAY_SIZE(arr) (sizeof(arr)/sizeof(arr[0]))
 
 #ifdef TFM_PSA_API
-#include "psa_client.h"
+#include "psa/client.h"
 
 /* Macro to check for a valid PSA handle */
 /* FixMe: Here temporarily until it's added to the framework headers */
diff --git a/interface/src/tfm_initial_attestation_api.c b/interface/src/tfm_initial_attestation_api.c
index f9ab4ce..9d00214 100644
--- a/interface/src/tfm_initial_attestation_api.c
+++ b/interface/src/tfm_initial_attestation_api.c
@@ -5,10 +5,10 @@
  *
  */
 
-#include "psa_initial_attestation_api.h"
+#include "psa/initial_attestation.h"
 #include "tfm_veneers.h"
 #include "tfm_ns_lock.h"
-#include "psa_client.h"
+#include "psa/client.h"
 #ifdef TFM_PSA_API
 #include "tfm_attest_defs.h"
 #endif
diff --git a/interface/src/tfm_psa_ns_api.c b/interface/src/tfm_psa_ns_api.c
index 159eef9..838e7b0 100644
--- a/interface/src/tfm_psa_ns_api.c
+++ b/interface/src/tfm_psa_ns_api.c
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2018, Arm Limited. All rights reserved.
+ * Copyright (c) 2018-2019, Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
  */
 
-#include "interface/include/psa_client.h"
+#include "psa/client.h"
 #include "tfm_ns_lock.h"
 #include "tfm_api.h"
 
@@ -72,4 +72,3 @@
                          0,
                          0);
 }
-
diff --git a/interface/src/tfm_sst_api.c b/interface/src/tfm_sst_api.c
index 96afadd..34d19fe 100644
--- a/interface/src/tfm_sst_api.c
+++ b/interface/src/tfm_sst_api.c
@@ -5,7 +5,7 @@
  *
  */
 
-#include "psa_protected_storage.h"
+#include "psa/protected_storage.h"
 
 #include "tfm_ns_lock.h"
 #include "tfm_veneers.h"
diff --git a/lib/t_cose/src/t_cose_psa_crypto_hash.c b/lib/t_cose/src/t_cose_psa_crypto_hash.c
index b34c6f6..3ba3e2f 100644
--- a/lib/t_cose/src/t_cose_psa_crypto_hash.c
+++ b/lib/t_cose/src/t_cose_psa_crypto_hash.c
@@ -11,7 +11,7 @@
  */
 
 #include "t_cose_crypto.h"
-#include "psa_crypto.h"
+#include "psa/crypto.h"
 
 /**
  * \brief Convert COSE algorithm ID to a PSA algorithm ID
diff --git a/lib/t_cose/src/t_cose_psa_crypto_sign.c b/lib/t_cose/src/t_cose_psa_crypto_sign.c
index 163f8b0..ba1bca2 100644
--- a/lib/t_cose/src/t_cose_psa_crypto_sign.c
+++ b/lib/t_cose/src/t_cose_psa_crypto_sign.c
@@ -10,7 +10,7 @@
 #include "tfm_plat_defs.h"
 #include "tfm_plat_crypto_keys.h"
 #include "tfm_memory_utils.h"
-#include "psa_crypto.h"
+#include "psa/crypto.h"
 
 /* Avoid compiler warning due to unused argument */
 #define ARG_UNUSED(arg) (void)(arg)
diff --git a/lib/t_cose/src/t_cose_psa_crypto_verify.c b/lib/t_cose/src/t_cose_psa_crypto_verify.c
index aee3603..5e25edf 100644
--- a/lib/t_cose/src/t_cose_psa_crypto_verify.c
+++ b/lib/t_cose/src/t_cose_psa_crypto_verify.c
@@ -6,7 +6,7 @@
  */
 
 #include "t_cose_crypto.h"
-#include "psa_crypto.h"
+#include "psa/crypto.h"
 #include "attest_public_key.h"
 
 /* Avoid compiler warning due to unused argument */
diff --git a/platform/ext/common/tfm_initial_attestation_key_material.c b/platform/ext/common/tfm_initial_attestation_key_material.c
index f60521a..afcd8ee 100644
--- a/platform/ext/common/tfm_initial_attestation_key_material.c
+++ b/platform/ext/common/tfm_initial_attestation_key_material.c
@@ -91,7 +91,7 @@
 
 /* Hash (SHA256) of initial attestation public key.
  * Byte string representation of ECC public key according to
- * psa_export_public_key() in interface/include/psa_crypto.h:
+ * psa_export_public_key() in interface/include/psa/crypto.h:
  * 0x04 || X_coord || Y_coord
  */
 TFM_LINK_SET_RO_IN_PARTITION_SECTION("TFM_SP_INITIAL_ATTESTATION")
diff --git a/platform/ext/target/musca_b1/services/src/tfm_platform_system.c b/platform/ext/target/musca_b1/services/src/tfm_platform_system.c
index be11acd..07425d7 100644
--- a/platform/ext/target/musca_b1/services/src/tfm_platform_system.c
+++ b/platform/ext/target/musca_b1/services/src/tfm_platform_system.c
@@ -10,7 +10,7 @@
 #include "platform_description.h"
 #include "target_cfg.h"
 #include "device_definition.h"
-#include "psa_client.h"
+#include "psa/client.h"
 #include "tfm_secure_api.h"
 #include "services/include/tfm_ioctl_api.h"
 
@@ -113,4 +113,3 @@
             return TFM_PLATFORM_ERR_NOT_SUPPORTED;
     }
 }
-
diff --git a/platform/include/tfm_platform_system.h b/platform/include/tfm_platform_system.h
index c248fe5..c297d3b 100644
--- a/platform/include/tfm_platform_system.h
+++ b/platform/include/tfm_platform_system.h
@@ -12,7 +12,7 @@
  *       target.
  */
 
-#include "psa_client.h"
+#include "psa/client.h"
 #include "tfm_plat_defs.h"
 #include "tfm_platform_api.h"
 
diff --git a/secure_fw/core/ipc/include/tfm_message_queue.h b/secure_fw/core/ipc/include/tfm_message_queue.h
index 692be93..231dc3f 100644
--- a/secure_fw/core/ipc/include/tfm_message_queue.h
+++ b/secure_fw/core/ipc/include/tfm_message_queue.h
@@ -7,7 +7,7 @@
 #ifndef __TFM_MESSAGE_QUEUE_H__
 #define __TFM_MESSAGE_QUEUE_H__
 
-#include "psa_service.h"
+#include "psa/service.h"
 #include "tfm_wait.h"
 
 #define TFM_MSG_QUEUE_MAX_MSG_NUM   16
diff --git a/secure_fw/core/ipc/psa_client.c b/secure_fw/core/ipc/psa_client.c
index 6abc966..040d596 100644
--- a/secure_fw/core/ipc/psa_client.c
+++ b/secure_fw/core/ipc/psa_client.c
@@ -8,7 +8,7 @@
 #include <inttypes.h>
 #include <stdio.h>
 #include "tfm_svc.h"
-#include "psa_client.h"
+#include "psa/client.h"
 
 __attribute__((naked, section("SFN")))
 uint32_t psa_framework_version(void)
diff --git a/secure_fw/core/ipc/psa_service.c b/secure_fw/core/ipc/psa_service.c
index 0c86954..13eb973 100644
--- a/secure_fw/core/ipc/psa_service.c
+++ b/secure_fw/core/ipc/psa_service.c
@@ -8,8 +8,8 @@
 #include <inttypes.h>
 #include <stdio.h>
 #include "tfm_svc.h"
-#include "psa_client.h"
-#include "psa_service.h"
+#include "psa/client.h"
+#include "psa/service.h"
 
 __attribute__((naked, section("SFN")))
 psa_signal_t psa_wait(psa_signal_t signal_mask, uint32_t timeout)
diff --git a/secure_fw/core/ipc/tfm_pools.c b/secure_fw/core/ipc/tfm_pools.c
index 2adb70e..8e954f4 100644
--- a/secure_fw/core/ipc/tfm_pools.c
+++ b/secure_fw/core/ipc/tfm_pools.c
@@ -9,8 +9,8 @@
 #include <stdlib.h>
 #include "tfm_thread.h"
 #include "tfm_wait.h"
-#include "psa_client.h"
-#include "psa_service.h"
+#include "psa/client.h"
+#include "psa/service.h"
 #include "tfm_internal_defines.h"
 #include "cmsis_compiler.h"
 #include "tfm_utils.h"
diff --git a/secure_fw/core/ipc/tfm_spm.c b/secure_fw/core/ipc/tfm_spm.c
index 4f45070..3aa43ca 100644
--- a/secure_fw/core/ipc/tfm_spm.c
+++ b/secure_fw/core/ipc/tfm_spm.c
@@ -8,8 +8,8 @@
 #include <limits.h>
 #include <stdbool.h>
 #include <stdlib.h>
-#include "psa_client.h"
-#include "psa_service.h"
+#include "psa/client.h"
+#include "psa/service.h"
 #include "tfm_utils.h"
 #include "platform/include/tfm_spm_hal.h"
 #include "spm_api.h"
diff --git a/secure_fw/core/ipc/tfm_svcalls.c b/secure_fw/core/ipc/tfm_svcalls.c
index 2dc75ab..301b508 100644
--- a/secure_fw/core/ipc/tfm_svcalls.c
+++ b/secure_fw/core/ipc/tfm_svcalls.c
@@ -7,8 +7,8 @@
 #include <inttypes.h>
 #include <stdbool.h>
 #include <stdlib.h>
-#include "psa_client.h"
-#include "psa_service.h"
+#include "psa/client.h"
+#include "psa/service.h"
 #include "tfm_svc.h"
 #include "tfm_svcalls.h"
 #include "tfm_thread.h"
diff --git a/secure_fw/core/tfm_boot_data.c b/secure_fw/core/tfm_boot_data.c
index 44c38a3..c4f5882 100644
--- a/secure_fw/core/tfm_boot_data.c
+++ b/secure_fw/core/tfm_boot_data.c
@@ -15,7 +15,7 @@
 #ifdef TFM_PSA_API
 #include "tfm_internal_defines.h"
 #include "tfm_utils.h"
-#include "psa_service.h"
+#include "psa/service.h"
 #include "tfm_thread.h"
 #include "tfm_wait.h"
 #include "tfm_message_queue.h"
diff --git a/secure_fw/core/tfm_core.c b/secure_fw/core/tfm_core.c
index 30dca20..bb0c978 100644
--- a/secure_fw/core/tfm_core.c
+++ b/secure_fw/core/tfm_core.c
@@ -19,8 +19,8 @@
 #include "tfm_irq_signal_defs.h"
 #include "tfm_irq_list.h"
 #ifdef TFM_PSA_API
-#include "psa_client.h"
-#include "psa_service.h"
+#include "psa/client.h"
+#include "psa/service.h"
 #include "tfm_thread.h"
 #include "tfm_wait.h"
 #include "tfm_message_queue.h"
diff --git a/secure_fw/core/tfm_func_api.c b/secure_fw/core/tfm_func_api.c
index dcbce48..f526b25 100644
--- a/secure_fw/core/tfm_func_api.c
+++ b/secure_fw/core/tfm_func_api.c
@@ -20,7 +20,7 @@
 #include "tfm_arch.h"
 #include "platform/include/tfm_spm_hal.h"
 #include "tfm_irq_list.h"
-#include "psa_service.h"
+#include "psa/service.h"
 
 #define EXC_RETURN_SECURE_FUNCTION 0xFFFFFFFD
 #define EXC_RETURN_SECURE_HANDLER  0xFFFFFFF1
diff --git a/secure_fw/core/tfm_irq_list.h b/secure_fw/core/tfm_irq_list.h
index 3dcfd2f..ab22ca7 100644
--- a/secure_fw/core/tfm_irq_list.h
+++ b/secure_fw/core/tfm_irq_list.h
@@ -8,7 +8,7 @@
 #ifndef __TFM_IRQ_LIST_H__
 #define __TFM_IRQ_LIST_H__
 
-#include "psa_service.h"
+#include "psa/service.h"
 
 #define TFM_DEFAULT_SECURE_IRQ_PRIOTITY 128
 
diff --git a/secure_fw/core/tfm_secure_api.h b/secure_fw/core/tfm_secure_api.h
index d3b20c4..190ba27 100644
--- a/secure_fw/core/tfm_secure_api.h
+++ b/secure_fw/core/tfm_secure_api.h
@@ -14,7 +14,7 @@
 #include "tfm_core.h"
 #include "tfm_api.h"
 #include "bl2/include/tfm_boot_status.h"
-#include "psa_service.h"
+#include "psa/service.h"
 
 /*!
  * \def __tfm_secure_gateway_attributes__
diff --git a/secure_fw/core/tfm_spm_services.c b/secure_fw/core/tfm_spm_services.c
index f580833..3b88301 100644
--- a/secure_fw/core/tfm_spm_services.c
+++ b/secure_fw/core/tfm_spm_services.c
@@ -12,7 +12,7 @@
 #include "tfm_internal.h"
 #include "secure_fw/include/tfm_spm_services_api.h"
 #include "spm_api.h"
-#include "psa_service.h"
+#include "psa/service.h"
 
 uint8_t *tfm_scratch_area;
 uint32_t tfm_scratch_area_size;
diff --git a/secure_fw/ns_callable/tfm_psa_api_veneers.c b/secure_fw/ns_callable/tfm_psa_api_veneers.c
index d9e22c7..420d0c4 100644
--- a/secure_fw/ns_callable/tfm_psa_api_veneers.c
+++ b/secure_fw/ns_callable/tfm_psa_api_veneers.c
@@ -7,8 +7,8 @@
 
 #include <stdbool.h>
 #include <stdio.h>
-#include "psa_client.h"
-#include "psa_service.h"
+#include "psa/client.h"
+#include "psa/service.h"
 #include "secure_utilities.h"
 #include "tfm_arch.h"
 #include "tfm_secure_api.h"
diff --git a/secure_fw/services/crypto/crypto_init.c b/secure_fw/services/crypto/crypto_init.c
index e32ceb0..9e061b2 100644
--- a/secure_fw/services/crypto/crypto_init.c
+++ b/secure_fw/services/crypto/crypto_init.c
@@ -21,7 +21,7 @@
 #endif
 
 #ifdef TFM_PSA_API
-#include "psa_service.h"
+#include "psa/service.h"
 #include "tfm_crypto_signal.h"
 #include "secure_fw/core/tfm_memory_utils.h"
 
diff --git a/secure_fw/services/crypto/tfm_crypto_api.h b/secure_fw/services/crypto/tfm_crypto_api.h
index d74b251..da23f6f 100644
--- a/secure_fw/services/crypto/tfm_crypto_api.h
+++ b/secure_fw/services/crypto/tfm_crypto_api.h
@@ -15,9 +15,9 @@
 #include <stdint.h>
 #include "tfm_api.h"
 #include "tfm_crypto_defs.h"
-#include "psa_crypto.h"
+#include "psa/crypto.h"
 #ifdef TFM_PSA_API
-#include "psa_service.h"
+#include "psa/service.h"
 
 /**
  * \brief This define is a function pointer type to the Uniform Signature API
diff --git a/secure_fw/services/crypto/tfm_crypto_secure_api.c b/secure_fw/services/crypto/tfm_crypto_secure_api.c
index 3ebe23c..21a16e9 100644
--- a/secure_fw/services/crypto/tfm_crypto_secure_api.c
+++ b/secure_fw/services/crypto/tfm_crypto_secure_api.c
@@ -7,12 +7,12 @@
 
 #include "tfm_veneers.h"
 #include "tfm_crypto_defs.h"
-#include "psa_crypto.h"
+#include "psa/crypto.h"
 
 #define ARRAY_SIZE(arr) (sizeof(arr)/sizeof(arr[0]))
 
 #ifdef TFM_PSA_API
-#include "psa_client.h"
+#include "psa/client.h"
 
 /* Macro to check for a valid PSA handle */
 /* FixMe: Here temporarily until it's added to the framework headers */
diff --git a/secure_fw/services/crypto/tfm_mbedcrypto_include.h b/secure_fw/services/crypto/tfm_mbedcrypto_include.h
index b04b180..20f030d 100644
--- a/secure_fw/services/crypto/tfm_mbedcrypto_include.h
+++ b/secure_fw/services/crypto/tfm_mbedcrypto_include.h
@@ -9,7 +9,7 @@
 #define __TFM_MBEDCRYPTO_INCLUDE_H__
 
 /* FIXME: The PSA Crypto headers in Mbed Crypto define PSA_SUCCESS and typedef
- * psa_status_t. To prevent redefinition errors in psa_client.h, use the
+ * psa_status_t. To prevent redefinition errors in psa/client.h, use the
  * preprocessor to prefix psa_status_t in the Mbed Crypto headers, and then
  * undef psa_status_t and PSA_SUCCESS after the include.
  */
diff --git a/secure_fw/services/initial_attestation/attestation.h b/secure_fw/services/initial_attestation/attestation.h
index f73ed0f..6a2fe0c 100644
--- a/secure_fw/services/initial_attestation/attestation.h
+++ b/secure_fw/services/initial_attestation/attestation.h
@@ -8,7 +8,7 @@
 #ifndef __ATTESTATION_H__
 #define __ATTESTATION_H__
 
-#include "psa_initial_attestation_api.h"
+#include "psa/initial_attestation.h"
 #include "tfm_client.h"
 #include "bl2/include/tfm_boot_status.h"
 
diff --git a/secure_fw/services/initial_attestation/attestation_key.c b/secure_fw/services/initial_attestation/attestation_key.c
index f122542..12e86cd 100644
--- a/secure_fw/services/initial_attestation/attestation_key.c
+++ b/secure_fw/services/initial_attestation/attestation_key.c
@@ -8,7 +8,7 @@
 #include "attestation_key.h"
 #include <stdint.h>
 #include <stddef.h>
-#include "psa_initial_attestation_api.h"
+#include "psa/initial_attestation.h"
 #include "platform/include/tfm_plat_defs.h"
 #include "platform/include/tfm_plat_crypto_keys.h"
 
diff --git a/secure_fw/services/initial_attestation/attestation_key.h b/secure_fw/services/initial_attestation/attestation_key.h
index e9f3916..94c1d7e 100644
--- a/secure_fw/services/initial_attestation/attestation_key.h
+++ b/secure_fw/services/initial_attestation/attestation_key.h
@@ -8,8 +8,8 @@
 #ifndef __ATTESTATION_KEY_H__
 #define __ATTESTATION_KEY_H__
 
-#include "psa_initial_attestation_api.h"
-#include "psa_crypto.h"
+#include "psa/initial_attestation.h"
+#include "psa/crypto.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/secure_fw/services/initial_attestation/tfm_attestation.c b/secure_fw/services/initial_attestation/tfm_attestation.c
index f4b1acd..1b8757a 100644
--- a/secure_fw/services/initial_attestation/tfm_attestation.c
+++ b/secure_fw/services/initial_attestation/tfm_attestation.c
@@ -8,7 +8,7 @@
 #include "tfm_api.h"
 #include "tfm_secure_api.h"
 #include "attestation.h"
-#include "psa_initial_attestation_api.h"
+#include "psa/initial_attestation.h"
 #include "bl2/include/tfm_boot_status.h"
 
 #ifdef TFM_PSA_API
diff --git a/secure_fw/services/initial_attestation/tfm_attestation_req_mngr.c b/secure_fw/services/initial_attestation/tfm_attestation_req_mngr.c
index d899bc6..97042bd 100644
--- a/secure_fw/services/initial_attestation/tfm_attestation_req_mngr.c
+++ b/secure_fw/services/initial_attestation/tfm_attestation_req_mngr.c
@@ -6,13 +6,13 @@
  */
 
 #include <string.h>
-#include "psa_initial_attestation_api.h"
+#include "psa/initial_attestation.h"
 #include "attestation.h"
 
 #ifdef TFM_PSA_API
 #include "tfm_attest_signal.h"
 #include "tfm_client.h"
-#include "psa_service.h"
+#include "psa/service.h"
 #include "region_defs.h"
 
 #define IOVEC_LEN(x) (sizeof(x)/sizeof(x[0]))
diff --git a/secure_fw/services/initial_attestation/tfm_attestation_secure_api.c b/secure_fw/services/initial_attestation/tfm_attestation_secure_api.c
index d403839..1e426d7 100644
--- a/secure_fw/services/initial_attestation/tfm_attestation_secure_api.c
+++ b/secure_fw/services/initial_attestation/tfm_attestation_secure_api.c
@@ -5,7 +5,7 @@
  *
  */
 
-#include "psa_initial_attestation_api.h"
+#include "psa/initial_attestation.h"
 #include "tfm_veneers.h"
 #include "tfm_memory_utils.h"
 #include "tfm_client.h"
diff --git a/secure_fw/services/initial_attestation/tfm_client.h b/secure_fw/services/initial_attestation/tfm_client.h
index 78adb0d..9de6ae4 100644
--- a/secure_fw/services/initial_attestation/tfm_client.h
+++ b/secure_fw/services/initial_attestation/tfm_client.h
@@ -8,13 +8,13 @@
 #ifndef __TFM_CLIENT_H__
 #define __TFM_CLIENT_H__
 
-#include "psa_client.h" /* psa_invec, psa_outvec */
+#include "psa/client.h" /* psa_invec, psa_outvec */
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-/* Intentionally empty, the aim of this file to include psa_client.h, which
+/* Intentionally empty, the aim of this file to include psa/client.h, which
  * contains the psa_invec and psa_outvec definitions in TF-M project, but these
  * might has different location in another projects.
  */
diff --git a/secure_fw/services/secure_storage/crypto/sst_crypto_interface.c b/secure_fw/services/secure_storage/crypto/sst_crypto_interface.c
index ae898fc..de9d9d4 100644
--- a/secure_fw/services/secure_storage/crypto/sst_crypto_interface.c
+++ b/secure_fw/services/secure_storage/crypto/sst_crypto_interface.c
@@ -10,7 +10,7 @@
 #include <stdbool.h>
 
 #include "platform/include/tfm_plat_crypto_keys.h"
-#include "psa_crypto.h"
+#include "psa/crypto.h"
 #include "secure_fw/core/tfm_memory_utils.h"
 
 /* FIXME: HUK management should be part of Crypto service, with keys hidden from
diff --git a/secure_fw/services/secure_storage/crypto/sst_crypto_interface.h b/secure_fw/services/secure_storage/crypto/sst_crypto_interface.h
index a0c34dc..da9639a 100644
--- a/secure_fw/services/secure_storage/crypto/sst_crypto_interface.h
+++ b/secure_fw/services/secure_storage/crypto/sst_crypto_interface.h
@@ -11,7 +11,7 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include "psa_protected_storage.h"
+#include "psa/protected_storage.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/secure_fw/services/secure_storage/flash/sst_flash.h b/secure_fw/services/secure_storage/flash/sst_flash.h
index b461b07..8697e8b 100644
--- a/secure_fw/services/secure_storage/flash/sst_flash.h
+++ b/secure_fw/services/secure_storage/flash/sst_flash.h
@@ -9,7 +9,7 @@
 #define __SST_FLASH_H__
 
 #include <stdint.h>
-#include "psa_protected_storage.h"
+#include "psa/protected_storage.h"
 #include "flash_layout.h"
 
 #ifdef __cplusplus
diff --git a/secure_fw/services/secure_storage/flash_fs/sst_flash_fs.h b/secure_fw/services/secure_storage/flash_fs/sst_flash_fs.h
index 8694b22..4af3f99 100644
--- a/secure_fw/services/secure_storage/flash_fs/sst_flash_fs.h
+++ b/secure_fw/services/secure_storage/flash_fs/sst_flash_fs.h
@@ -17,7 +17,7 @@
  */
 
 #include <stdint.h>
-#include "psa_protected_storage.h"
+#include "psa/protected_storage.h"
 
 /*!
  * \struct sst_file_info_t
diff --git a/secure_fw/services/secure_storage/flash_fs/sst_flash_fs_dblock.h b/secure_fw/services/secure_storage/flash_fs/sst_flash_fs_dblock.h
index 05a682b..4ba4ea5 100644
--- a/secure_fw/services/secure_storage/flash_fs/sst_flash_fs_dblock.h
+++ b/secure_fw/services/secure_storage/flash_fs/sst_flash_fs_dblock.h
@@ -10,7 +10,7 @@
 
 #include <stdint.h>
 #include "sst_flash_fs_mblock.h"
-#include "psa_protected_storage.h"
+#include "psa/protected_storage.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/secure_fw/services/secure_storage/flash_fs/sst_flash_fs_mblock.h b/secure_fw/services/secure_storage/flash_fs/sst_flash_fs_mblock.h
index f42a957..bee15f9 100644
--- a/secure_fw/services/secure_storage/flash_fs/sst_flash_fs_mblock.h
+++ b/secure_fw/services/secure_storage/flash_fs/sst_flash_fs_mblock.h
@@ -12,7 +12,7 @@
 
 #include "secure_fw/services/secure_storage/flash/sst_flash.h"
 #include "secure_fw/services/secure_storage/sst_object_defs.h"
-#include "psa_protected_storage.h"
+#include "psa/protected_storage.h"
 
 /*!
  * \def SST_SUPPORTED_VERSION
diff --git a/secure_fw/services/secure_storage/nv_counters/sst_nv_counters.h b/secure_fw/services/secure_storage/nv_counters/sst_nv_counters.h
index b15ec65..2c3bfc1 100644
--- a/secure_fw/services/secure_storage/nv_counters/sst_nv_counters.h
+++ b/secure_fw/services/secure_storage/nv_counters/sst_nv_counters.h
@@ -17,7 +17,7 @@
  */
 
 #include <stdint.h>
-#include "psa_protected_storage.h"
+#include "psa/protected_storage.h"
 #include "platform/include/tfm_plat_nv_counters.h"
 
 #define TFM_SST_NV_COUNTER_1        PLAT_NV_COUNTER_0
diff --git a/secure_fw/services/secure_storage/sst_encrypted_object.h b/secure_fw/services/secure_storage/sst_encrypted_object.h
index cd757e1..ce72f16 100644
--- a/secure_fw/services/secure_storage/sst_encrypted_object.h
+++ b/secure_fw/services/secure_storage/sst_encrypted_object.h
@@ -10,7 +10,7 @@
 
 #include <stdint.h>
 #include "sst_object_defs.h"
-#include "psa_protected_storage.h"
+#include "psa/protected_storage.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/secure_fw/services/secure_storage/sst_object_defs.h b/secure_fw/services/secure_storage/sst_object_defs.h
index fe0616f..56aedf2 100644
--- a/secure_fw/services/secure_storage/sst_object_defs.h
+++ b/secure_fw/services/secure_storage/sst_object_defs.h
@@ -11,7 +11,7 @@
 #include <stdint.h>
 
 #include "flash_layout.h"
-#include "psa_protected_storage.h"
+#include "psa/protected_storage.h"
 #include "sst_utils.h"
 
 #ifdef SST_ENCRYPTION
diff --git a/secure_fw/services/secure_storage/sst_object_system.h b/secure_fw/services/secure_storage/sst_object_system.h
index 46bcfca..668f329 100644
--- a/secure_fw/services/secure_storage/sst_object_system.h
+++ b/secure_fw/services/secure_storage/sst_object_system.h
@@ -10,7 +10,7 @@
 
 #include <stdint.h>
 
-#include "psa_protected_storage.h"
+#include "psa/protected_storage.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/secure_fw/services/secure_storage/sst_object_table.h b/secure_fw/services/secure_storage/sst_object_table.h
index 68f6ec5..5e42e71 100644
--- a/secure_fw/services/secure_storage/sst_object_table.h
+++ b/secure_fw/services/secure_storage/sst_object_table.h
@@ -10,7 +10,7 @@
 
 #include <stdint.h>
 
-#include "psa_protected_storage.h"
+#include "psa/protected_storage.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/secure_fw/services/secure_storage/sst_utils.h b/secure_fw/services/secure_storage/sst_utils.h
index b03b6c7..ade05b2 100644
--- a/secure_fw/services/secure_storage/sst_utils.h
+++ b/secure_fw/services/secure_storage/sst_utils.h
@@ -11,7 +11,7 @@
 #include <stdint.h>
 
 #include "flash_layout.h"
-#include "psa_protected_storage.h"
+#include "psa/protected_storage.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/secure_fw/services/secure_storage/tfm_protected_storage.h b/secure_fw/services/secure_storage/tfm_protected_storage.h
index e7fdd27..62dfb59 100644
--- a/secure_fw/services/secure_storage/tfm_protected_storage.h
+++ b/secure_fw/services/secure_storage/tfm_protected_storage.h
@@ -10,7 +10,7 @@
 
 #include <stdint.h>
 
-#include "psa_protected_storage.h"
+#include "psa/protected_storage.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/secure_fw/services/secure_storage/tfm_sst_req_mngr.c b/secure_fw/services/secure_storage/tfm_sst_req_mngr.c
index d18b6b3..0ebadee 100644
--- a/secure_fw/services/secure_storage/tfm_sst_req_mngr.c
+++ b/secure_fw/services/secure_storage/tfm_sst_req_mngr.c
@@ -10,12 +10,12 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#include "psa_protected_storage.h"
+#include "psa/protected_storage.h"
 #include "secure_fw/core/tfm_secure_api.h"
 #include "tfm_api.h"
 #include "tfm_protected_storage.h"
 #ifdef TFM_PSA_API
-#include "psa_service.h"
+#include "psa/service.h"
 #include "tfm_sst_signal.h"
 #include "flash_layout.h"
 #endif
diff --git a/secure_fw/services/secure_storage/tfm_sst_req_mngr.h b/secure_fw/services/secure_storage/tfm_sst_req_mngr.h
index 964d9f2..d6a611e 100644
--- a/secure_fw/services/secure_storage/tfm_sst_req_mngr.h
+++ b/secure_fw/services/secure_storage/tfm_sst_req_mngr.h
@@ -10,7 +10,7 @@
 
 #include <stddef.h>
 
-#include "psa_client.h"
+#include "psa/client.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/secure_fw/services/secure_storage/tfm_sst_secure_api.c b/secure_fw/services/secure_storage/tfm_sst_secure_api.c
index 5cb6d60..d38cb77 100644
--- a/secure_fw/services/secure_storage/tfm_sst_secure_api.c
+++ b/secure_fw/services/secure_storage/tfm_sst_secure_api.c
@@ -5,7 +5,7 @@
  *
  */
 
-#include "psa_protected_storage.h"
+#include "psa/protected_storage.h"
 #include "tfm_veneers.h"
 #include "tfm_sst_defs.h"
 
diff --git a/test/framework/test_framework_helpers.h b/test/framework/test_framework_helpers.h
index fe530a3..8d42fe7 100644
--- a/test/framework/test_framework_helpers.h
+++ b/test/framework/test_framework_helpers.h
@@ -9,7 +9,7 @@
 #define __TEST_FRAMEWORK_HELPERS_H__
 
 #include <stdint.h>
-#include "psa_protected_storage.h"
+#include "psa/protected_storage.h"
 #include "test_framework.h"
 
 #ifdef __cplusplus
diff --git a/test/suites/attestation/attest_public_key.c b/test/suites/attestation/attest_public_key.c
index c7fc869..23ef43f 100644
--- a/test/suites/attestation/attest_public_key.c
+++ b/test/suites/attestation/attest_public_key.c
@@ -6,8 +6,8 @@
  */
 
 #include "attest_public_key.h"
-#include "psa_initial_attestation_api.h"
-#include "psa_crypto.h"
+#include "psa/initial_attestation.h"
+#include "psa/crypto.h"
 #include <stdint.h>
 
 /*!
@@ -20,7 +20,7 @@
 
 /*!
  *   Byte string representation of ECC public key according to
- *   psa_export_public_key() in interface/include/psa_crypto.h
+ *   psa_export_public_key() in interface/include/psa/crypto.h
  */
 struct ecc_public_key_t {
     const uint8_t a;
diff --git a/test/suites/attestation/attest_public_key.h b/test/suites/attestation/attest_public_key.h
index c555b2c..fa9d03f 100644
--- a/test/suites/attestation/attest_public_key.h
+++ b/test/suites/attestation/attest_public_key.h
@@ -8,8 +8,8 @@
 #ifndef __ATTEST_PUBLIC_KEY_H__
 #define __ATTEST_PUBLIC_KEY_H__
 
-#include "psa_initial_attestation_api.h"
-#include "psa_crypto.h"
+#include "psa/initial_attestation.h"
+#include "psa/crypto.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/test/suites/attestation/attest_token_test.c b/test/suites/attestation/attest_token_test.c
index c540788..731f24c 100644
--- a/test/suites/attestation/attest_token_test.c
+++ b/test/suites/attestation/attest_token_test.c
@@ -10,7 +10,7 @@
 
 #include "attest_token_test.h"
 #include "q_useful_buf.h"
-#include "psa_initial_attestation_api.h"
+#include "psa/initial_attestation.h"
 #include "attest_token_decode.h"
 #include "attest_token_test_values.h"
 
diff --git a/test/suites/attestation/attestation_tests_common.h b/test/suites/attestation/attestation_tests_common.h
index 18d54b2..bf82db3 100644
--- a/test/suites/attestation/attestation_tests_common.h
+++ b/test/suites/attestation/attestation_tests_common.h
@@ -8,7 +8,7 @@
 #ifndef __ATTESTATION_TESTS_COMMON_H__
 #define __ATTESTATION_TESTS_COMMON_H__
 
-#include "psa_initial_attestation_api.h"
+#include "psa/initial_attestation.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/test/suites/attestation/non_secure/attestation_ns_interface_testsuite.c b/test/suites/attestation/non_secure/attestation_ns_interface_testsuite.c
index ff85025..02a129f 100644
--- a/test/suites/attestation/non_secure/attestation_ns_interface_testsuite.c
+++ b/test/suites/attestation/non_secure/attestation_ns_interface_testsuite.c
@@ -6,7 +6,7 @@
  */
 
 #include "attestation_ns_tests.h"
-#include "psa_initial_attestation_api.h"
+#include "psa/initial_attestation.h"
 #include "secure_fw/services/initial_attestation/attestation.h"
 #include "../attestation_tests_common.h"
 #include "../attest_token_test_values.h"
diff --git a/test/suites/attestation/secure/attestation_s_interface_testsuite.c b/test/suites/attestation/secure/attestation_s_interface_testsuite.c
index c32c331..288f0a7 100644
--- a/test/suites/attestation/secure/attestation_s_interface_testsuite.c
+++ b/test/suites/attestation/secure/attestation_s_interface_testsuite.c
@@ -6,7 +6,7 @@
  */
 
 #include "attestation_s_tests.h"
-#include "psa_initial_attestation_api.h"
+#include "psa/initial_attestation.h"
 #include "secure_fw/services/initial_attestation/attestation.h"
 #include "../attestation_tests_common.h"
 #include "../attest_token_test_values.h"
diff --git a/test/suites/crypto/crypto_tests_common.h b/test/suites/crypto/crypto_tests_common.h
index 573edcb..3a0f56e 100644
--- a/test/suites/crypto/crypto_tests_common.h
+++ b/test/suites/crypto/crypto_tests_common.h
@@ -12,7 +12,7 @@
 extern "C" {
 #endif
 
-#include "psa_crypto.h"
+#include "psa/crypto.h"
 #include "test/framework/test_framework_helpers.h"
 
 /**
diff --git a/test/suites/crypto/non_secure/crypto_ns_interface_testsuite.c b/test/suites/crypto/non_secure/crypto_ns_interface_testsuite.c
index 4399bc0..38cbbf1 100644
--- a/test/suites/crypto/non_secure/crypto_ns_interface_testsuite.c
+++ b/test/suites/crypto/non_secure/crypto_ns_interface_testsuite.c
@@ -89,7 +89,7 @@
  * \brief Non-Secure interface test for Crypto
  *
  * \details The scope of this set of tests is to functionally verify
- *          the interfaces specified by psa_crypto.h are working
+ *          the interfaces specified by psa/crypto.h are working
  *          as expected. This is not meant to cover all possible
  *          scenarios and corner cases.
  *
diff --git a/test/suites/crypto/secure/crypto_sec_interface_testsuite.c b/test/suites/crypto/secure/crypto_sec_interface_testsuite.c
index 71d8a77..e8dc27e 100644
--- a/test/suites/crypto/secure/crypto_sec_interface_testsuite.c
+++ b/test/suites/crypto/secure/crypto_sec_interface_testsuite.c
@@ -89,7 +89,7 @@
  * \brief Secure interface test for Crypto
  *
  * \details The scope of this set of tests is to functionally verify
- *          the interfaces specified by psa_crypto.h are working
+ *          the interfaces specified by psa/crypto.h are working
  *          as expected. This is not meant to cover all possible
  *          scenarios and corner cases.
  *
diff --git a/test/suites/ipc/non_secure/ipc_ns_interface_testsuite.c b/test/suites/ipc/non_secure/ipc_ns_interface_testsuite.c
index 71a73f5..a77373d 100644
--- a/test/suites/ipc/non_secure/ipc_ns_interface_testsuite.c
+++ b/test/suites/ipc/non_secure/ipc_ns_interface_testsuite.c
@@ -7,7 +7,7 @@
 
 #include <stdio.h>
 #include "ipc_ns_tests.h"
-#include "psa_client.h"
+#include "psa/client.h"
 #include "test/framework/test_framework_helpers.h"
 
 /* Define the SID. These SIDs should align with the value in manifest file. */
diff --git a/test/suites/ipc/secure/ipc_s_interface_testsuite.c b/test/suites/ipc/secure/ipc_s_interface_testsuite.c
index 62258b8..0937f8d 100644
--- a/test/suites/ipc/secure/ipc_s_interface_testsuite.c
+++ b/test/suites/ipc/secure/ipc_s_interface_testsuite.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (c) 2018, Arm Limited. All rights reserved.
+ * Copyright (c) 2018-2019, Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
  */
 
 #include "ipc_s_tests.h"
-#include "psa_client.h"
+#include "psa/client.h"
 #include "test/framework/test_framework_helpers.h"
 
 /* List of tests */
diff --git a/test/suites/sst/non_secure/psa_ps_ns_interface_testsuite.c b/test/suites/sst/non_secure/psa_ps_ns_interface_testsuite.c
index 7d3cd75..cecc41a 100644
--- a/test/suites/sst/non_secure/psa_ps_ns_interface_testsuite.c
+++ b/test/suites/sst/non_secure/psa_ps_ns_interface_testsuite.c
@@ -11,7 +11,7 @@
 #include <string.h>
 
 #include "ns_test_helpers.h"
-#include "psa_protected_storage.h"
+#include "psa/protected_storage.h"
 #include "test/framework/test_framework_helpers.h"
 
 /* Test UIDs */
diff --git a/test/suites/sst/secure/nv_counters/test_sst_nv_counters.h b/test/suites/sst/secure/nv_counters/test_sst_nv_counters.h
index a4175ca..b1b85ab 100644
--- a/test/suites/sst/secure/nv_counters/test_sst_nv_counters.h
+++ b/test/suites/sst/secure/nv_counters/test_sst_nv_counters.h
@@ -9,7 +9,7 @@
 #define __TEST_SST_NV_COUNTERS_H__
 
 #include <stdint.h>
-#include "psa_protected_storage.h"
+#include "psa/protected_storage.h"
 #include "platform/include/tfm_plat_nv_counters.h"
 
 #ifdef __cplusplus
diff --git a/test/suites/sst/secure/psa_ps_s_interface_testsuite.c b/test/suites/sst/secure/psa_ps_s_interface_testsuite.c
index fb44929..6ee3df8 100644
--- a/test/suites/sst/secure/psa_ps_s_interface_testsuite.c
+++ b/test/suites/sst/secure/psa_ps_s_interface_testsuite.c
@@ -11,7 +11,7 @@
 
 #include "s_test_helpers.h"
 #include "secure_fw/core/tfm_memory_utils.h"
-#include "psa_protected_storage.h"
+#include "psa/protected_storage.h"
 #include "test/framework/test_framework_helpers.h"
 
 /* Test UIDs */
diff --git a/test/suites/sst/secure/psa_ps_s_reliability_testsuite.c b/test/suites/sst/secure/psa_ps_s_reliability_testsuite.c
index 53f46db..624c134 100644
--- a/test/suites/sst/secure/psa_ps_s_reliability_testsuite.c
+++ b/test/suites/sst/secure/psa_ps_s_reliability_testsuite.c
@@ -9,7 +9,7 @@
 
 #include <stdio.h>
 
-#include "psa_protected_storage.h"
+#include "psa/protected_storage.h"
 #include "secure_fw/core/tfm_memory_utils.h"
 #include "s_test_helpers.h"
 #include "test/framework/test_framework_helpers.h"
diff --git a/test/suites/sst/secure/sst_rollback_protection_testsuite.c b/test/suites/sst/secure/sst_rollback_protection_testsuite.c
index 3eef9d0..6dc27f9 100644
--- a/test/suites/sst/secure/sst_rollback_protection_testsuite.c
+++ b/test/suites/sst/secure/sst_rollback_protection_testsuite.c
@@ -11,7 +11,7 @@
 
 #include "secure_fw/services/secure_storage/nv_counters/sst_nv_counters.h"
 #include "nv_counters/test_sst_nv_counters.h"
-#include "psa_protected_storage.h"
+#include "psa/protected_storage.h"
 #include "secure_fw/core/tfm_memory_utils.h"
 #include "s_test_helpers.h"
 
diff --git a/test/test_services/tfm_core_test/tfm_ss_core_test.c b/test/test_services/tfm_core_test/tfm_ss_core_test.c
index 6488d79..1b61307 100644
--- a/test/test_services/tfm_core_test/tfm_ss_core_test.c
+++ b/test/test_services/tfm_core_test/tfm_ss_core_test.c
@@ -14,7 +14,7 @@
 #include "secure_fw/core/tfm_secure_api.h"
 #include "secure_fw/include/tfm_spm_services_api.h"
 #include "spm_partition_defs.h"
-#include "psa_service.h"
+#include "psa/service.h"
 #include "test/test_services/tfm_core_test/tfm_ss_core_test_signal.h"
 #include "test/test_services/tfm_core_test_2/tfm_ss_core_test_2_signal.h"
 #include "tfm_plat_test.h"
diff --git a/test/test_services/tfm_core_test_2/tfm_ss_core_test_2.c b/test/test_services/tfm_core_test_2/tfm_ss_core_test_2.c
index 7fa0210..49b605e 100644
--- a/test/test_services/tfm_core_test_2/tfm_ss_core_test_2.c
+++ b/test/test_services/tfm_core_test_2/tfm_ss_core_test_2.c
@@ -11,7 +11,7 @@
 #include "tfm_api.h"
 #include "tfm_secure_api.h"
 #include "spm_partition_defs.h"
-#include "psa_service.h"
+#include "psa/service.h"
 #include "tfm_ss_core_test_2_signal.h"
 
 #define INVALID_NS_CLIENT_ID  0x49abcdef
diff --git a/test/test_services/tfm_ipc_client/tfm_ipc_client_test.c b/test/test_services/tfm_ipc_client/tfm_ipc_client_test.c
index 6f2149f..79d32b7 100644
--- a/test/test_services/tfm_ipc_client/tfm_ipc_client_test.c
+++ b/test/test_services/tfm_ipc_client/tfm_ipc_client_test.c
@@ -7,9 +7,9 @@
 
 #include <stdio.h>
 #include <assert.h>
-#include "psa_client.h"
+#include "psa/client.h"
 #include "secure_utilities.h"
-#include "psa_service.h"
+#include "psa/service.h"
 #include "tfm_ipc_client_partition.h"
 #include "tfm_utils.h"
 
diff --git a/test/test_services/tfm_ipc_service/tfm_ipc_service_test.c b/test/test_services/tfm_ipc_service/tfm_ipc_service_test.c
index 61e085e..e2e15c4 100644
--- a/test/test_services/tfm_ipc_service/tfm_ipc_service_test.c
+++ b/test/test_services/tfm_ipc_service/tfm_ipc_service_test.c
@@ -8,8 +8,8 @@
 #include <assert.h>
 #include <stdio.h>
 #include <stdbool.h>
-#include "psa_client.h"
-#include "psa_service.h"
+#include "psa/client.h"
+#include "psa/service.h"
 #include "secure_fw/core/secure_utilities.h"
 #include "secure_fw/core/tfm_secure_api.h"
 #include "tfm_api.h"
diff --git a/test/test_services/tfm_irq_test_service_1/tfm_irq_test_service_1.c b/test/test_services/tfm_irq_test_service_1/tfm_irq_test_service_1.c
index 373e6dc..d0e3a44 100644
--- a/test/test_services/tfm_irq_test_service_1/tfm_irq_test_service_1.c
+++ b/test/test_services/tfm_irq_test_service_1/tfm_irq_test_service_1.c
@@ -13,7 +13,7 @@
 #include "secure_fw/include/tfm_spm_services_api.h"
 #include "spm_partition_defs.h"
 #include "test/test_services/tfm_core_test/core_test_defs.h"
-#include "psa_service.h"
+#include "psa/service.h"
 #include "tfm_irq_test_service_1_signal.h"
 #include "tfm_irq_signal_defs.h"
 #include "tfm_plat_test.h"
diff --git a/test/test_services/tfm_secure_client_service/tfm_secure_client_service.c b/test/test_services/tfm_secure_client_service/tfm_secure_client_service.c
index 313ca04..41bcc86 100644
--- a/test/test_services/tfm_secure_client_service/tfm_secure_client_service.c
+++ b/test/test_services/tfm_secure_client_service/tfm_secure_client_service.c
@@ -8,8 +8,8 @@
 #include "tfm_secure_client_service.h"
 #include "test/framework/test_framework_integ_test.h"
 #ifdef TFM_PSA_API
-#include "psa_client.h"
-#include "psa_service.h"
+#include "psa/client.h"
+#include "psa/service.h"
 #include "tfm_sec_client_ser_sig.h"
 #endif
 
diff --git a/test/test_services/tfm_secure_client_service/tfm_secure_client_service_api.c b/test/test_services/tfm_secure_client_service/tfm_secure_client_service_api.c
index dc76eca..4629db4 100644
--- a/test/test_services/tfm_secure_client_service/tfm_secure_client_service_api.c
+++ b/test/test_services/tfm_secure_client_service/tfm_secure_client_service_api.c
@@ -7,7 +7,7 @@
 
 #include "tfm_secure_client_service_api.h"
 #ifdef TFM_PSA_API
-#include "psa_client.h"
+#include "psa/client.h"
 #include "tfm_api.h"
 
 /*