diff --git a/tf-psa-crypto/CMakeLists.txt b/tf-psa-crypto/CMakeLists.txt
index 6e9789a90b..31832acbf7 100644
--- a/tf-psa-crypto/CMakeLists.txt
+++ b/tf-psa-crypto/CMakeLists.txt
@@ -35,6 +35,12 @@ if(LIB_INSTALL_DIR)
     set(CMAKE_INSTALL_LIBDIR "${LIB_INSTALL_DIR}")
 endif()
 
+set(TF_PSA_CRYPTO_PYTHON_EXECUTABLE ${MBEDTLS_PYTHON_EXECUTABLE})
+set(USE_STATIC_TF_PSA_CRYPTO_LIBRARY ${USE_STATIC_MBEDTLS_LIBRARY})
+set(USE_SHARED_TF_PSA_CRYPTO_LIBRARY ${USE_SHARED_MBEDTLS_LIBRARY})
+set(TF_PSA_CRYPTO_TARGET_PREFIX ${MBEDTLS_TARGET_PREFIX})
+option(INSTALL_TF_PSA_CRYPTO_HEADERS "Install TF-PSA-Crypto headers." ${INSTALL_MBEDTLS_HEADERS})
+
 # Set the project root directory.
 set(TF_PSA_CRYPTO_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 
diff --git a/tf-psa-crypto/core/CMakeLists.txt b/tf-psa-crypto/core/CMakeLists.txt
index dfc292cc4a..0917cae2f4 100644
--- a/tf-psa-crypto/core/CMakeLists.txt
+++ b/tf-psa-crypto/core/CMakeLists.txt
@@ -14,7 +14,7 @@ if(GEN_FILES)
             ${CMAKE_CURRENT_BINARY_DIR}/psa_crypto_driver_wrappers.h
             ${CMAKE_CURRENT_BINARY_DIR}/psa_crypto_driver_wrappers_no_static.c
         COMMAND
-            ${MBEDTLS_PYTHON_EXECUTABLE}
+            ${TF_PSA_CRYPTO_PYTHON_EXECUTABLE}
                 ${MBEDTLS_DIR}/scripts/generate_driver_wrappers.py
                 ${CMAKE_CURRENT_BINARY_DIR}
         DEPENDS
@@ -64,21 +64,21 @@ if(LINK_WITH_TRUSTED_STORAGE)
     set(libs ${libs} trusted_storage)
 endif()
 
-if (NOT USE_STATIC_MBEDTLS_LIBRARY AND NOT USE_SHARED_MBEDTLS_LIBRARY)
-    message(FATAL_ERROR "Need to choose static or shared mbedtls build!")
-endif(NOT USE_STATIC_MBEDTLS_LIBRARY AND NOT USE_SHARED_MBEDTLS_LIBRARY)
+if (NOT USE_STATIC_TF_PSA_CRYPTO_LIBRARY AND NOT USE_SHARED_TF_PSA_CRYPTO_LIBRARY)
+    message(FATAL_ERROR "Need to choose static or shared TF-PSA-Crypto build!")
+endif(NOT USE_STATIC_TF_PSA_CRYPTO_LIBRARY AND NOT USE_SHARED_TF_PSA_CRYPTO_LIBRARY)
 
-set(mbedcrypto_target "${MBEDTLS_TARGET_PREFIX}mbedcrypto")
-set(builtin_target "${MBEDTLS_TARGET_PREFIX}builtin")
+set(mbedcrypto_target "${TF_PSA_CRYPTO_TARGET_PREFIX}mbedcrypto")
+set(builtin_target "${TF_PSA_CRYPTO_TARGET_PREFIX}builtin")
 
-if (USE_STATIC_MBEDTLS_LIBRARY)
+if (USE_STATIC_TF_PSA_CRYPTO_LIBRARY)
     set(mbedcrypto_static_target ${mbedcrypto_target})
     set(builtin_static_target ${builtin_target})
 endif()
 
 set(target_libraries ${mbedcrypto_target})
 
-if(USE_STATIC_MBEDTLS_LIBRARY AND USE_SHARED_MBEDTLS_LIBRARY)
+if(USE_STATIC_TF_PSA_CRYPTO_LIBRARY AND USE_SHARED_TF_PSA_CRYPTO_LIBRARY)
     string(APPEND mbedcrypto_static_target "_static")
     string(APPEND builtin_static_target "_static")
 
@@ -86,10 +86,10 @@ if(USE_STATIC_MBEDTLS_LIBRARY AND USE_SHARED_MBEDTLS_LIBRARY)
         ${mbedcrypto_static_target})
 endif()
 
-set(p256m_target "${MBEDTLS_TARGET_PREFIX}p256m")
-set(everest_target "${MBEDTLS_TARGET_PREFIX}everest")
+set(p256m_target "${TF_PSA_CRYPTO_TARGET_PREFIX}p256m")
+set(everest_target "${TF_PSA_CRYPTO_TARGET_PREFIX}everest")
 
-if(USE_STATIC_MBEDTLS_LIBRARY)
+if(USE_STATIC_TF_PSA_CRYPTO_LIBRARY)
     add_library(${mbedcrypto_static_target} STATIC ${src_crypto})
     set_target_properties(${mbedcrypto_static_target} PROPERTIES OUTPUT_NAME mbedcrypto)
     target_link_libraries(${mbedcrypto_static_target} PUBLIC ${libs})
@@ -103,9 +103,9 @@ if(USE_STATIC_MBEDTLS_LIBRARY)
     if(TARGET ${p256m_target})
         target_link_libraries(${mbedcrypto_static_target} PUBLIC ${p256m_target})
     endif()
-endif(USE_STATIC_MBEDTLS_LIBRARY)
+endif(USE_STATIC_TF_PSA_CRYPTO_LIBRARY)
 
-if(USE_SHARED_MBEDTLS_LIBRARY)
+if(USE_SHARED_TF_PSA_CRYPTO_LIBRARY)
     set(CMAKE_LIBRARY_PATH ${CMAKE_CURRENT_BINARY_DIR})
     add_library(${mbedcrypto_target} SHARED ${src_crypto})
     set_target_properties(${mbedcrypto_target} PROPERTIES VERSION 4.0.0 SOVERSION 16)
@@ -120,7 +120,7 @@ if(USE_SHARED_MBEDTLS_LIBRARY)
     if(TARGET ${p256m_target})
         target_link_libraries(${mbedcrypto_target} PUBLIC ${p256m_target})
     endif()
-endif(USE_SHARED_MBEDTLS_LIBRARY)
+endif(USE_SHARED_TF_PSA_CRYPTO_LIBRARY)
 
 foreach(target IN LISTS target_libraries)
     add_library(MbedTLS::${target} ALIAS ${target})  # add_subdirectory support
@@ -154,15 +154,15 @@ foreach(target IN LISTS target_libraries)
         PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
 endforeach(target)
 
-if(USE_STATIC_MBEDTLS_LIBRARY)
+if(USE_STATIC_TF_PSA_CRYPTO_LIBRARY)
     add_custom_command(
         TARGET ${mbedcrypto_static_target}
         POST_BUILD
         COMMAND ${CMAKE_COMMAND}
         ARGS -E copy $<TARGET_FILE:${mbedcrypto_static_target}> ${CMAKE_BINARY_DIR}/library)
-endif(USE_STATIC_MBEDTLS_LIBRARY)
+endif(USE_STATIC_TF_PSA_CRYPTO_LIBRARY)
 
-if(USE_SHARED_MBEDTLS_LIBRARY)
+if(USE_SHARED_TF_PSA_CRYPTO_LIBRARY)
     add_custom_command(
         TARGET ${mbedcrypto_target}
         POST_BUILD
@@ -175,4 +175,4 @@ if(USE_SHARED_MBEDTLS_LIBRARY)
         COMMAND ${CMAKE_COMMAND}
         ARGS -E copy $<TARGET_LINKER_FILE:${mbedcrypto_target}>
         ${CMAKE_BINARY_DIR}/library/$<TARGET_LINKER_FILE_NAME:${mbedcrypto_target}>)
-endif(USE_SHARED_MBEDTLS_LIBRARY)
+endif(USE_SHARED_TF_PSA_CRYPTO_LIBRARY)
diff --git a/tf-psa-crypto/drivers/builtin/CMakeLists.txt b/tf-psa-crypto/drivers/builtin/CMakeLists.txt
index ed2c0f80d0..0043fca4e2 100644
--- a/tf-psa-crypto/drivers/builtin/CMakeLists.txt
+++ b/tf-psa-crypto/drivers/builtin/CMakeLists.txt
@@ -86,20 +86,20 @@ if(LINK_WITH_PTHREAD)
     set(libs ${libs} ${CMAKE_THREAD_LIBS_INIT})
 endif()
 
-set(builtin_target ${MBEDTLS_TARGET_PREFIX}builtin)
-if (USE_STATIC_MBEDTLS_LIBRARY)
+set(builtin_target ${TF_PSA_CRYPTO_TARGET_PREFIX}builtin)
+if (USE_STATIC_TF_PSA_CRYPTO_LIBRARY)
     set(builtin_static_target ${builtin_target})
 endif()
 set(target_libraries ${builtin_target})
-if(USE_STATIC_MBEDTLS_LIBRARY AND USE_SHARED_MBEDTLS_LIBRARY)
+if(USE_STATIC_TF_PSA_CRYPTO_LIBRARY AND USE_SHARED_TF_PSA_CRYPTO_LIBRARY)
     string(APPEND builtin_static_target "_static")
     list(APPEND target_libraries ${builtin_static_target})
 endif()
 
-set(p256m_target "${MBEDTLS_TARGET_PREFIX}p256m")
-set(everest_target "${MBEDTLS_TARGET_PREFIX}everest")
+set(p256m_target "${TF_PSA_CRYPTO_TARGET_PREFIX}p256m")
+set(everest_target "${TF_PSA_CRYPTO_TARGET_PREFIX}everest")
 
-if(USE_STATIC_MBEDTLS_LIBRARY)
+if(USE_STATIC_TF_PSA_CRYPTO_LIBRARY)
     add_library(${builtin_static_target} STATIC ${src_builtin})
     target_link_libraries(${builtin_static_target} PUBLIC ${libs})
     if(TARGET ${everest_target})
@@ -109,9 +109,9 @@ if(USE_STATIC_MBEDTLS_LIBRARY)
     if(TARGET ${p256m_target})
         target_link_libraries(${builtin_static_target} PUBLIC ${p256m_target})
     endif()
-endif(USE_STATIC_MBEDTLS_LIBRARY)
+endif(USE_STATIC_TF_PSA_CRYPTO_LIBRARY)
 
-if(USE_SHARED_MBEDTLS_LIBRARY)
+if(USE_SHARED_TF_PSA_CRYPTO_LIBRARY)
     add_library(${builtin_target} SHARED ${src_builtin})
     target_link_libraries(${builtin_target} PUBLIC ${libs})
     if(TARGET ${everest_target})
@@ -121,7 +121,7 @@ if(USE_SHARED_MBEDTLS_LIBRARY)
     if(TARGET ${p256m_target})
         target_link_libraries(${builtin_target} PUBLIC ${p256m_target})
     endif()
-endif(USE_SHARED_MBEDTLS_LIBRARY)
+endif(USE_SHARED_TF_PSA_CRYPTO_LIBRARY)
 
 foreach (target IN LISTS target_libraries)
     target_include_directories(${target}
@@ -144,7 +144,7 @@ foreach (target IN LISTS target_libraries)
             PUBLIC MBEDTLS_USER_CONFIG_FILE="${MBEDTLS_USER_CONFIG_FILE}")
     endif()
 
-    if(INSTALL_MBEDTLS_HEADERS)
+    if(INSTALL_TF_PSA_CRYPTO_HEADERS)
 
       install(DIRECTORY include/mbedtls
         DESTINATION include
@@ -153,7 +153,7 @@ foreach (target IN LISTS target_libraries)
         GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
         FILES_MATCHING PATTERN "*.h")
 
-    endif(INSTALL_MBEDTLS_HEADERS)
+    endif(INSTALL_TF_PSA_CRYPTO_HEADERS)
 
     install(TARGETS ${target}
     EXPORT MbedTLSTargets
diff --git a/tf-psa-crypto/drivers/everest/CMakeLists.txt b/tf-psa-crypto/drivers/everest/CMakeLists.txt
index 82a85974ff..e7048590ef 100644
--- a/tf-psa-crypto/drivers/everest/CMakeLists.txt
+++ b/tf-psa-crypto/drivers/everest/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(everest_target "${MBEDTLS_TARGET_PREFIX}everest")
+set(everest_target "${TF_PSA_CRYPTO_TARGET_PREFIX}everest")
 
 add_library(${everest_target}
   library/everest.c
@@ -29,7 +29,7 @@ if(MBEDTLS_USER_CONFIG_FILE)
         PUBLIC MBEDTLS_USER_CONFIG_FILE="${MBEDTLS_USER_CONFIG_FILE}")
 endif()
 
-if(INSTALL_MBEDTLS_HEADERS)
+if(INSTALL_TF_PSA_CRYPTO_HEADERS)
 
   install(DIRECTORY include/everest
     DESTINATION include
@@ -37,7 +37,7 @@ if(INSTALL_MBEDTLS_HEADERS)
     DIRECTORY_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
     FILES_MATCHING PATTERN "*.h")
 
-endif(INSTALL_MBEDTLS_HEADERS)
+endif(INSTALL_TF_PSA_CRYPTO_HEADERS)
 
 install(TARGETS ${everest_target}
   EXPORT MbedTLSTargets
diff --git a/tf-psa-crypto/drivers/p256-m/CMakeLists.txt b/tf-psa-crypto/drivers/p256-m/CMakeLists.txt
index 165ee150f8..bc53a5e465 100644
--- a/tf-psa-crypto/drivers/p256-m/CMakeLists.txt
+++ b/tf-psa-crypto/drivers/p256-m/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(p256m_target ${MBEDTLS_TARGET_PREFIX}p256m)
+set(p256m_target ${TF_PSA_CRYPTO_TARGET_PREFIX}p256m)
 
 add_library(${p256m_target}
     p256-m_driver_entrypoints.c
@@ -27,7 +27,7 @@ if(MBEDTLS_USER_CONFIG_FILE)
         PUBLIC MBEDTLS_USER_CONFIG_FILE="${MBEDTLS_USER_CONFIG_FILE}")
 endif()
 
-if(INSTALL_MBEDTLS_HEADERS)
+if(INSTALL_TF_PSA_CRYPTO_HEADERS)
 
   install(DIRECTORY :${CMAKE_CURRENT_SOURCE_DIR}
     DESTINATION include
@@ -35,7 +35,7 @@ if(INSTALL_MBEDTLS_HEADERS)
     DIRECTORY_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
     FILES_MATCHING PATTERN "*.h")
 
-endif(INSTALL_MBEDTLS_HEADERS)
+endif(INSTALL_TF_PSA_CRYPTO_HEADERS)
 
 install(TARGETS ${p256m_target}
 EXPORT MbedTLSTargets
diff --git a/tf-psa-crypto/tests/CMakeLists.txt b/tf-psa-crypto/tests/CMakeLists.txt
index dc3cea5f9a..862d8623b0 100644
--- a/tf-psa-crypto/tests/CMakeLists.txt
+++ b/tf-psa-crypto/tests/CMakeLists.txt
@@ -10,7 +10,7 @@ if(NOT DEFINED MBEDTLS_DIR)
     set(MBEDTLS_DIR ${CMAKE_SOURCE_DIR})
 endif()
 
-if(NOT MBEDTLS_PYTHON_EXECUTABLE)
+if(NOT TF_PSA_CRYPTO_PYTHON_EXECUTABLE)
     message(FATAL_ERROR "Cannot build test suites without Python 3")
 endif()
 
@@ -20,7 +20,7 @@ file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/suites)
 # Get base names for generated files
 execute_process(
     COMMAND
-        ${MBEDTLS_PYTHON_EXECUTABLE}
+        ${TF_PSA_CRYPTO_PYTHON_EXECUTABLE}
         ${MBEDTLS_FRAMEWORK_DIR}/scripts/generate_bignum_tests.py
         --list-for-cmake
     WORKING_DIRECTORY
@@ -32,7 +32,7 @@ string(REGEX REPLACE "[^;]*/" ""
 
 execute_process(
     COMMAND
-        ${MBEDTLS_PYTHON_EXECUTABLE}
+        ${TF_PSA_CRYPTO_PYTHON_EXECUTABLE}
         ${MBEDTLS_FRAMEWORK_DIR}/scripts/generate_config_tests.py
         --list-for-cmake
     WORKING_DIRECTORY
@@ -51,7 +51,7 @@ endforeach()
 
 execute_process(
     COMMAND
-        ${MBEDTLS_PYTHON_EXECUTABLE}
+        ${TF_PSA_CRYPTO_PYTHON_EXECUTABLE}
         ${MBEDTLS_FRAMEWORK_DIR}/scripts/generate_ecp_tests.py
         --list-for-cmake
     WORKING_DIRECTORY
@@ -63,7 +63,7 @@ string(REGEX REPLACE "[^;]*/" ""
 
 execute_process(
     COMMAND
-        ${MBEDTLS_PYTHON_EXECUTABLE}
+        ${TF_PSA_CRYPTO_PYTHON_EXECUTABLE}
         ${MBEDTLS_FRAMEWORK_DIR}/scripts/generate_psa_tests.py
         --list-for-cmake
     WORKING_DIRECTORY
@@ -104,7 +104,7 @@ if(GEN_FILES)
         WORKING_DIRECTORY
             ${CMAKE_CURRENT_SOURCE_DIR}/..
         COMMAND
-            ${MBEDTLS_PYTHON_EXECUTABLE}
+            ${TF_PSA_CRYPTO_PYTHON_EXECUTABLE}
             ${MBEDTLS_FRAMEWORK_DIR}/scripts/generate_bignum_tests.py
             --directory ${CMAKE_CURRENT_BINARY_DIR}/suites
         DEPENDS
@@ -122,7 +122,7 @@ if(GEN_FILES)
         WORKING_DIRECTORY
             ${CMAKE_CURRENT_SOURCE_DIR}/..
         COMMAND
-            ${MBEDTLS_PYTHON_EXECUTABLE}
+            ${TF_PSA_CRYPTO_PYTHON_EXECUTABLE}
             ${MBEDTLS_FRAMEWORK_DIR}/scripts/generate_config_tests.py
             --directory ${CMAKE_CURRENT_BINARY_DIR}/suites
             ${config_generated_data_files}
@@ -138,7 +138,7 @@ if(GEN_FILES)
         WORKING_DIRECTORY
             ${CMAKE_CURRENT_SOURCE_DIR}/..
         COMMAND
-            ${MBEDTLS_PYTHON_EXECUTABLE}
+            ${TF_PSA_CRYPTO_PYTHON_EXECUTABLE}
             ${MBEDTLS_FRAMEWORK_DIR}/scripts/generate_ecp_tests.py
             --directory ${CMAKE_CURRENT_BINARY_DIR}/suites
         DEPENDS
@@ -154,7 +154,7 @@ if(GEN_FILES)
         WORKING_DIRECTORY
             ${CMAKE_CURRENT_SOURCE_DIR}/..
         COMMAND
-            ${MBEDTLS_PYTHON_EXECUTABLE}
+            ${TF_PSA_CRYPTO_PYTHON_EXECUTABLE}
             ${MBEDTLS_FRAMEWORK_DIR}/scripts/generate_psa_tests.py
             --directory ${CMAKE_CURRENT_BINARY_DIR}/suites
         DEPENDS
@@ -278,7 +278,7 @@ function(add_test_suite suite_name)
             # input argument.
             test_suite_${data_name}.c
         COMMAND
-            ${MBEDTLS_PYTHON_EXECUTABLE}
+            ${TF_PSA_CRYPTO_PYTHON_EXECUTABLE}
             ${MBEDTLS_FRAMEWORK_DIR}/scripts/generate_test_code.py
             -f ${CMAKE_CURRENT_SOURCE_DIR}/suites/test_suite_${suite_name}.function
             -d ${data_file}