diff --git a/include/mbedtls/config_psa.h b/include/mbedtls/config_psa.h
index f614e444f..2d2397197 100644
--- a/include/mbedtls/config_psa.h
+++ b/include/mbedtls/config_psa.h
@@ -42,7 +42,7 @@
 
 /* We need this to have a complete list of requirements
  * before we deduce what built-ins are required. */
-#include "psa/crypto_adjust_keypair_types.h"
+#include "psa/crypto_adjust_config_key_pair_types.h"
 
 #include "mbedtls/config_adjust_legacy_from_psa.h"
 
@@ -54,7 +54,7 @@
 
 /* Hopefully the file above will have enabled keypair symbols in a consistent
  * way, but including this here fixes them if that wasn't the case. */
-#include "psa/crypto_adjust_keypair_types.h"
+#include "psa/crypto_adjust_config_key_pair_types.h"
 
 #endif /* MBEDTLS_PSA_CRYPTO_CONFIG */
 
diff --git a/include/psa/crypto_adjust_keypair_types.h b/include/psa/crypto_adjust_config_key_pair_types.h
similarity index 97%
rename from include/psa/crypto_adjust_keypair_types.h
rename to include/psa/crypto_adjust_config_key_pair_types.h
index 601377415..7736e752d 100644
--- a/include/psa/crypto_adjust_keypair_types.h
+++ b/include/psa/crypto_adjust_config_key_pair_types.h
@@ -1,6 +1,6 @@
 /**
- * \file psa/crypto_adjust_keypair_types.h
- * \brief Adjust PSA configuration for keypair types.
+ * \file psa/crypto_adjust_config_key_pair_types.h
+ * \brief Adjust PSA configuration for key pair types.
  *
  * See docs/proposed/psa-conditional-inclusion-c.md.
  * - Support non-basic operations in a keypair type implicitly enables basic