diff --git a/cmake/install.cmake b/cmake/install.cmake
index 2915ae3..de94702 100644
--- a/cmake/install.cmake
+++ b/cmake/install.cmake
@@ -44,12 +44,10 @@
 install(FILES       ${CMAKE_BINARY_DIR}/generated/interface/include/config_impl.h
         DESTINATION ${INSTALL_INTERFACE_INC_DIR})
 
-if (TFM_PSA_API)
-    install(FILES       ${INTERFACE_INC_DIR}/tfm_psa_call_pack.h
-            DESTINATION ${INSTALL_INTERFACE_INC_DIR})
-    install(FILES       ${CMAKE_BINARY_DIR}/generated/interface/include/psa/framework_feature.h
-            DESTINATION ${INSTALL_INTERFACE_INC_DIR}/psa)
-endif()
+install(FILES       ${INTERFACE_INC_DIR}/tfm_psa_call_pack.h
+        DESTINATION ${INSTALL_INTERFACE_INC_DIR})
+install(FILES       ${CMAKE_BINARY_DIR}/generated/interface/include/psa/framework_feature.h
+        DESTINATION ${INSTALL_INTERFACE_INC_DIR}/psa)
 
 if (TFM_PARTITION_NS_AGENT_MAILBOX)
     install(FILES       ${INTERFACE_INC_DIR}/multi_core/tfm_multi_core_api.h
@@ -60,11 +58,6 @@
             DESTINATION ${INSTALL_INTERFACE_INC_DIR})
 endif()
 
-if (NOT TFM_PSA_API)
-    install(FILES       ${CMAKE_BINARY_DIR}/generated/interface/include/tfm_veneers.h
-            DESTINATION ${INSTALL_INTERFACE_INC_DIR}/tfm/veneers)
-endif()
-
 if (TFM_PARTITION_PROTECTED_STORAGE)
     install(FILES       ${INTERFACE_INC_DIR}/psa/protected_storage.h
             DESTINATION ${INSTALL_INTERFACE_INC_DIR}/psa)
@@ -147,43 +140,23 @@
 endif()
 
 if (TFM_PARTITION_PROTECTED_STORAGE)
-    if (TFM_PSA_API)
-        install(FILES       ${INTERFACE_SRC_DIR}/tfm_ps_ipc_api.c
-                DESTINATION ${INSTALL_INTERFACE_SRC_DIR})
-    else()
-        install(FILES       ${INTERFACE_SRC_DIR}/tfm_ps_func_api.c
-                DESTINATION ${INSTALL_INTERFACE_SRC_DIR})
-    endif()
+    install(FILES       ${INTERFACE_SRC_DIR}/tfm_ps_ipc_api.c
+            DESTINATION ${INSTALL_INTERFACE_SRC_DIR})
 endif()
 
 if (TFM_PARTITION_INTERNAL_TRUSTED_STORAGE)
-    if (TFM_PSA_API)
-        install(FILES       ${INTERFACE_SRC_DIR}/tfm_its_ipc_api.c
-                DESTINATION ${INSTALL_INTERFACE_SRC_DIR})
-    else()
-        install(FILES       ${INTERFACE_SRC_DIR}/tfm_its_func_api.c
-                DESTINATION ${INSTALL_INTERFACE_SRC_DIR})
-    endif()
+    install(FILES       ${INTERFACE_SRC_DIR}/tfm_its_ipc_api.c
+            DESTINATION ${INSTALL_INTERFACE_SRC_DIR})
 endif()
 
 if (TFM_PARTITION_CRYPTO)
-    if (TFM_PSA_API)
-        install(FILES       ${INTERFACE_SRC_DIR}/tfm_crypto_ipc_api.c
-                DESTINATION ${INSTALL_INTERFACE_SRC_DIR})
-    else()
-        install(FILES       ${INTERFACE_SRC_DIR}/tfm_crypto_func_api.c
-                DESTINATION ${INSTALL_INTERFACE_SRC_DIR})
-    endif()
+    install(FILES       ${INTERFACE_SRC_DIR}/tfm_crypto_ipc_api.c
+            DESTINATION ${INSTALL_INTERFACE_SRC_DIR})
 endif()
 
 if (TFM_PARTITION_INITIAL_ATTESTATION)
-    if (TFM_PSA_API)
-        install(FILES       ${INTERFACE_SRC_DIR}/tfm_initial_attestation_ipc_api.c
-                DESTINATION ${INSTALL_INTERFACE_SRC_DIR})
-    else()
-        install(FILES       ${INTERFACE_SRC_DIR}/tfm_initial_attestation_func_api.c
-                DESTINATION ${INSTALL_INTERFACE_SRC_DIR})
-    endif()
+    install(FILES       ${INTERFACE_SRC_DIR}/tfm_initial_attestation_ipc_api.c
+            DESTINATION ${INSTALL_INTERFACE_SRC_DIR})
 endif()
 
 if(TFM_PARTITION_AUDIT_LOG)
@@ -192,13 +165,8 @@
 endif()
 
 if(TFM_PARTITION_PLATFORM)
-    if(TFM_PSA_API)
-        install(FILES       ${INTERFACE_SRC_DIR}/tfm_platform_ipc_api.c
-                DESTINATION ${INSTALL_INTERFACE_SRC_DIR})
-    else()
-        install(FILES       ${INTERFACE_SRC_DIR}/tfm_platform_func_api.c
-                DESTINATION ${INSTALL_INTERFACE_SRC_DIR})
-    endif()
+    install(FILES       ${INTERFACE_SRC_DIR}/tfm_platform_ipc_api.c
+            DESTINATION ${INSTALL_INTERFACE_SRC_DIR})
 endif()
 
 
@@ -231,13 +199,8 @@
 endif()
 
 if(TFM_PARTITION_FIRMWARE_UPDATE)
-    if(TFM_PSA_API)
-        install(FILES       ${INTERFACE_SRC_DIR}/tfm_firmware_update_ipc_api.c
-                DESTINATION ${INSTALL_INTERFACE_SRC_DIR})
-    else()
-        install(FILES       ${INTERFACE_SRC_DIR}/tfm_firmware_update_func_api.c
-                DESTINATION ${INSTALL_INTERFACE_SRC_DIR})
-    endif()
+    install(FILES       ${INTERFACE_SRC_DIR}/tfm_firmware_update_ipc_api.c
+            DESTINATION ${INSTALL_INTERFACE_SRC_DIR})
 endif()
 
 ##################### Platform-specific installation ###########################