diff --git a/library/aesce.c b/library/aesce.c
index 982cad6..4b7e048 100644
--- a/library/aesce.c
+++ b/library/aesce.c
@@ -99,7 +99,7 @@
 #include <sys/auxv.h>
 #endif
 
-#if !defined(MBEDTLS_AES_HAS_NO_PLAIN_C)
+#if !defined(MBEDTLS_AES_DONT_USE_SOFTWARE_CRYPTO)
 /*
  * AES instruction support detection routine
  */
diff --git a/library/aesce.h b/library/aesce.h
index a67fc0d..900eac7 100644
--- a/library/aesce.h
+++ b/library/aesce.h
@@ -33,7 +33,7 @@
 #if !defined(MBEDTLS_HAVE_ARM64)
 #if defined(__aarch64__) || defined(_M_ARM64) || defined(_M_ARM64EC)
 #define MBEDTLS_HAVE_ARM64
-#if !defined(MBEDTLS_AESCE_C) && !defined(MBEDTLS_AES_HAS_NO_PLAIN_C)
+#if !defined(MBEDTLS_AESCE_C) && !defined(MBEDTLS_AES_DONT_USE_SOFTWARE_CRYPTO)
 #error "MBEDTLS_AESCE_C defined, but not all prerequisites"
 #endif
 #endif
@@ -50,7 +50,7 @@
  *
  * \return         1 if CPU has support for the feature, 0 otherwise
  */
-#if !defined(MBEDTLS_AES_HAS_NO_PLAIN_C)
+#if !defined(MBEDTLS_AES_DONT_USE_SOFTWARE_CRYPTO)
 int mbedtls_aesce_has_support(void);
 #else
 #define /* no-check-names */ mbedtls_aesce_has_support() 1
diff --git a/library/aesni.c b/library/aesni.c
index 766b671..31321c4 100644
--- a/library/aesni.c
+++ b/library/aesni.c
@@ -39,7 +39,7 @@
 #include <immintrin.h>
 #endif
 
-#if !defined(MBEDTLS_AES_HAS_NO_PLAIN_C)
+#if !defined(MBEDTLS_AES_DONT_USE_SOFTWARE_CRYPTO)
 /*
  * AES-NI support detection routine
  */
@@ -69,7 +69,7 @@
 
     return (c & what) != 0;
 }
-#endif /* !MBEDTLS_AES_HAS_NO_PLAIN_C */
+#endif /* !MBEDTLS_AES_DONT_USE_SOFTWARE_CRYPTO */
 
 #if MBEDTLS_AESNI_HAVE_CODE == 2
 
diff --git a/library/aesni.h b/library/aesni.h
index 1c96070..1302a11 100644
--- a/library/aesni.h
+++ b/library/aesni.h
@@ -39,7 +39,7 @@
     (defined(__amd64__) || defined(__x86_64__))   &&  \
     !defined(MBEDTLS_HAVE_X86_64)
 #define MBEDTLS_HAVE_X86_64
-#if !defined(MBEDTLS_AESNI_C) && !defined(MBEDTLS_AES_HAS_NO_PLAIN_C)
+#if !defined(MBEDTLS_AESNI_C) && !defined(MBEDTLS_AES_DONT_USE_SOFTWARE_CRYPTO)
 #error "MBEDTLS_AESCE_C defined, but not all prerequisites"
 #endif
 #endif
@@ -91,7 +91,7 @@
  *
  * \return         1 if CPU has support for the feature, 0 otherwise
  */
-#if !defined(MBEDTLS_AES_HAS_NO_PLAIN_C)
+#if !defined(MBEDTLS_AES_DONT_USE_SOFTWARE_CRYPTO)
 int mbedtls_aesni_has_support(unsigned int what);
 #else
 #define /* no-check-names */ mbedtls_aesni_has_support(what) 1
diff --git a/library/padlock.c b/library/padlock.c
index eeb6368..82b84bf 100644
--- a/library/padlock.c
+++ b/library/padlock.c
@@ -33,7 +33,7 @@
 
 #if defined(MBEDTLS_HAVE_X86)
 
-#if !defined(MBEDTLS_AES_HAS_NO_PLAIN_C)
+#if !defined(MBEDTLS_AES_DONT_USE_SOFTWARE_CRYPTO)
 /*
  * PadLock detection routine
  */
diff --git a/library/padlock.h b/library/padlock.h
index 4158386..7356d01 100644
--- a/library/padlock.h
+++ b/library/padlock.h
@@ -47,7 +47,7 @@
 
 #include <stdint.h>
 
-#if !defined(MBEDTLS_PADLOCK_C) && !defined(MBEDTLS_AES_HAS_NO_PLAIN_C)
+#if !defined(MBEDTLS_PADLOCK_C) && !defined(MBEDTLS_AES_DONT_USE_SOFTWARE_CRYPTO)
 #error "MBEDTLS_AESCE_C defined, but not all prerequisites"
 #endif
 
@@ -72,7 +72,7 @@
  *
  * \return         non-zero if CPU has support for the feature, 0 otherwise
  */
-#if !defined(MBEDTLS_AES_HAS_NO_PLAIN_C)
+#if !defined(MBEDTLS_AES_DONT_USE_SOFTWARE_CRYPTO)
 int mbedtls_padlock_has_support(int feature);
 #else
 #define /* no-check-names */ mbedtls_padlock_has_support(feature) 1