diff --git a/ChangeLog.d/sha256-armce-arm.txt b/ChangeLog.d/sha256-armce-arm.txt
index 13d4dda1ad..bff70f5000 100644
--- a/ChangeLog.d/sha256-armce-arm.txt
+++ b/ChangeLog.d/sha256-armce-arm.txt
@@ -1,5 +1,5 @@
 Features
-    * Support Armv8 Crypto Extension acceleration for SHA-256
+    * Support Armv8-A Crypto Extension acceleration for SHA-256
       when compiling for Thumb or 32-bit Arm.
 New deprecations
     * Rename the SHAxxx_USE_A64_CRYPTO_yyy config options to
diff --git a/include/mbedtls/check_config.h b/include/mbedtls/check_config.h
index 24b3e03e21..0dba0a872e 100644
--- a/include/mbedtls/check_config.h
+++ b/include/mbedtls/check_config.h
@@ -866,7 +866,7 @@
 #endif
 
 #if defined(MBEDTLS_SHA256_USE_ARMV8_CRYPTO_ONLY) && !defined(MBEDTLS_ARCH_IS_ARMV8)
-#error "MBEDTLS_SHA256_USE_ARMV8_CRYPTO_ONLY defined on non-Armv8 system"
+#error "MBEDTLS_SHA256_USE_ARMV8_CRYPTO_ONLY defined on non-Armv8-A system"
 #endif
 
 /* TLS 1.3 requires separate HKDF parts from PSA,
diff --git a/include/mbedtls/mbedtls_config.h b/include/mbedtls/mbedtls_config.h
index 0cbb0ee41a..595b8cd890 100644
--- a/include/mbedtls/mbedtls_config.h
+++ b/include/mbedtls/mbedtls_config.h
@@ -3277,7 +3277,7 @@
  * If not, the library will fall back to the C implementation.
  *
  * \note If MBEDTLS_SHA256_USE_ARMV8_CRYPTO_IF_PRESENT is defined when building
- * for a non-Armv8 build it will be silently ignored.
+ * for a non-Armv8-A build it will be silently ignored.
  *
  * \note    Minimum compiler versions for this feature are Clang 4.0,
  * armclang 6.6 or GCC 6.0.
@@ -3296,7 +3296,7 @@
  *
  * Module:  library/sha256.c
  *
- * Uncomment to have the library check for the Armv8 SHA-256 crypto extensions
+ * Uncomment to have the library check for the Armv8-A SHA-256 crypto extensions
  * and use them if available.
  */
 //#define MBEDTLS_SHA256_USE_ARMV8_CRYPTO_IF_PRESENT
@@ -3335,7 +3335,7 @@
  *
  * Module:  library/sha256.c
  *
- * Uncomment to have the library use the Armv8 SHA-256 crypto extensions
+ * Uncomment to have the library use the Armv8-A SHA-256 crypto extensions
  * unconditionally.
  */
 //#define MBEDTLS_SHA256_USE_ARMV8_CRYPTO_ONLY
@@ -3416,7 +3416,7 @@
  *
  * Module:  library/sha512.c
  *
- * Uncomment to have the library check for the Armv8 SHA-512 crypto extensions
+ * Uncomment to have the library check for the Armv8-A SHA-512 crypto extensions
  * and use them if available.
  */
 //#define MBEDTLS_SHA512_USE_ARMV8_CRYPTO_IF_PRESENT
@@ -3455,7 +3455,7 @@
  *
  * Module:  library/sha512.c
  *
- * Uncomment to have the library use the Armv8 SHA-512 crypto extensions
+ * Uncomment to have the library use the Armv8-A SHA-512 crypto extensions
  * unconditionally.
  */
 //#define MBEDTLS_SHA512_USE_ARMV8_CRYPTO_ONLY