diff --git a/include/mbedtls/config_psa.h b/include/mbedtls/config_psa.h
index 0e4150454..fb0e7c4fa 100644
--- a/include/mbedtls/config_psa.h
+++ b/include/mbedtls/config_psa.h
@@ -1032,7 +1032,7 @@ extern "C" {
 #define PSA_WANT_ALG_SOME_PAKE 1
 #endif
 
-/* Backward compatibility */
+/* Temporary internal migration helpers */
 #if defined(PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_USE) && \
     defined(PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_IMPORT) && \
     defined(PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_EXPORT) && \
@@ -1041,7 +1041,7 @@ extern "C" {
 #define MBEDTLS_PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_LEGACY
 #endif
 
-/* Backward compatibility */
+/* Temporary internal migration helpers */
 #if defined(PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_USE) && \
     defined(PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_IMPORT) && \
     defined(PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_EXPORT) && \
@@ -1049,7 +1049,7 @@ extern "C" {
 #define MBEDTLS_PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_LEGACY
 #endif
 
-/* Backward compatibility */
+/* Temporary internal migration helpers */
 #if defined(PSA_WANT_KEY_TYPE_DH_KEY_PAIR_USE) && \
     defined(PSA_WANT_KEY_TYPE_DH_KEY_PAIR_IMPORT) && \
     defined(PSA_WANT_KEY_TYPE_DH_KEY_PAIR_EXPORT) && \
@@ -1057,7 +1057,7 @@ extern "C" {
 #define MBEDTLS_PSA_WANT_KEY_TYPE_DH_KEY_PAIR_LEGACY
 #endif
 
-/* Backward compatibility */
+/* Temporary internal migration helpers */
 #if defined(MBEDTLS_PSA_BUILTIN_KEY_TYPE_ECC_KEY_PAIR_USE) && \
     defined(MBEDTLS_PSA_BUILTIN_KEY_TYPE_ECC_KEY_PAIR_IMPORT) && \
     defined(MBEDTLS_PSA_BUILTIN_KEY_TYPE_ECC_KEY_PAIR_EXPORT) && \
@@ -1066,7 +1066,7 @@ extern "C" {
 #define MBEDTLS_PSA_BUILTIN_KEY_TYPE_ECC_KEY_PAIR_LEGACY
 #endif
 
-/* Backward compatibility */
+/* Temporary internal migration helpers */
 #if defined(MBEDTLS_PSA_BUILTIN_KEY_TYPE_RSA_KEY_PAIR_USE) && \
     defined(MBEDTLS_PSA_BUILTIN_KEY_TYPE_RSA_KEY_PAIR_IMPORT) && \
     defined(MBEDTLS_PSA_BUILTIN_KEY_TYPE_RSA_KEY_PAIR_EXPORT) && \
@@ -1074,7 +1074,7 @@ extern "C" {
 #define MBEDTLS_PSA_BUILTIN_KEY_TYPE_RSA_KEY_PAIR_LEGACY
 #endif
 
-/* Backward compatibility */
+/* Temporary internal migration helpers */
 #if defined(MBEDTLS_PSA_BUILTIN_KEY_TYPE_DH_KEY_PAIR_USE) && \
     defined(MBEDTLS_PSA_BUILTIN_KEY_TYPE_DH_KEY_PAIR_IMPORT) && \
     defined(MBEDTLS_PSA_BUILTIN_KEY_TYPE_DH_KEY_PAIR_EXPORT) && \