diff --git a/include/psa/crypto_config.h b/include/psa/crypto_config.h
index 8fc2c83f0..f8d7a1ba5 100644
--- a/include/psa/crypto_config.h
+++ b/include/psa/crypto_config.h
@@ -80,19 +80,19 @@
 #define PSA_WANT_ALG_TLS12_PSK_TO_MS            1
 #define PSA_WANT_ALG_XTS                        1
 
-#define PSA_WANT_ECC_BP256R1                    1
-#define PSA_WANT_ECC_BP384R1                    1
-#define PSA_WANT_ECC_BP512R1                    1
-#define PSA_WANT_ECC_CURVE25519                 1
-#define PSA_WANT_ECC_CURVE448                   1
-#define PSA_WANT_ECC_SECP192K1                  1
-#define PSA_WANT_ECC_SECP192R1                  1
-#define PSA_WANT_ECC_SECP224K1                  1
-#define PSA_WANT_ECC_SECP224R1                  1
-#define PSA_WANT_ECC_SECP256K1                  1
-#define PSA_WANT_ECC_SECP256R1                  1
-#define PSA_WANT_ECC_SECP384R1                  1
-#define PSA_WANT_ECC_SECP521R1                  1
+#define PSA_WANT_ECC_BP_R1_256                  1
+#define PSA_WANT_ECC_BP_R1_384                  1
+#define PSA_WANT_ECC_BP_R1_512                  1
+#define PSA_WANT_ECC_MONTGOMERY_255             1
+#define PSA_WANT_ECC_MONTGOMERY_448             1
+#define PSA_WANT_ECC_SECP_K1_192                1
+#define PSA_WANT_ECC_SECP_K1_224                1
+#define PSA_WANT_ECC_SECP_K1_256                1
+#define PSA_WANT_ECC_SECP_R1_192                1
+#define PSA_WANT_ECC_SECP_R1_224                1
+#define PSA_WANT_ECC_SECP_R1_256                1
+#define PSA_WANT_ECC_SECP_R1_384                1
+#define PSA_WANT_ECC_SECP_R1_521                1
 
 #define PSA_WANT_KEY_TYPE_DERIVE                1
 #define PSA_WANT_KEY_TYPE_HMAC                  1