diff --git a/ChangeLog.d/pkcs7-parser.txt b/ChangeLog.d/pkcs7-parser.txt
index a988e95859..ac477b1f00 100644
--- a/ChangeLog.d/pkcs7-parser.txt
+++ b/ChangeLog.d/pkcs7-parser.txt
@@ -1,15 +1,15 @@
 Features
-   * Added partial support for parsing the PKCS #7 cryptographic message
-     syntax, as defined in RFC 2315. Currently, support is limited to the
+   * Added partial support for parsing the PKCS #7 Cryptographic Message
+     Syntax, as defined in RFC 2315. Currently, support is limited to the
      following:
-     - Only the signed data content type, version 1 is supported.
+     - Only the signed-data content type, version 1 is supported.
      - Only DER encoding is supported.
      - Only a single digest algorithm per message is supported.
      - Only 0 or 1 certificates are supported per message, which must be in
        X.509 format.
-     - There is no support for certificate-revocation lists.
+     - There is no support for certificate revocation lists.
      - The authenticated and unauthenticated attribute fields of SignerInfo
        must be empty.
      Many thanks to Daniel Axtens, Nayna Jain, and Nick Child from IBM for
      contributing this feature. Thanks to Demi-Marie Obenour for contributing
-     various improvements, tests and bug-fixes.
+     various improvements, tests and bug fixes.
diff --git a/include/mbedtls/mbedtls_config.h b/include/mbedtls/mbedtls_config.h
index 63649f42ec..ffc216eb98 100644
--- a/include/mbedtls/mbedtls_config.h
+++ b/include/mbedtls/mbedtls_config.h
@@ -2862,7 +2862,7 @@
 /**
  * \def MBEDTLS_PKCS7_C
  *
- * Enable PKCS7 core for using PKCS7 formatted signatures.
+ * Enable PKCS #7 core for using PKCS #7-formatted signatures.
  * RFC Link - https://tools.ietf.org/html/rfc2315
  *
  * Module:  library/pkcs7.c
diff --git a/include/mbedtls/pkcs7.h b/include/mbedtls/pkcs7.h
index 7f2aa9e9e5..cf1555cfd0 100644
--- a/include/mbedtls/pkcs7.h
+++ b/include/mbedtls/pkcs7.h
@@ -22,8 +22,8 @@
  */
 
 /**
- * Note: For the time being, this implementation of the PKCS #7 cryptographic
- * message syntax is a partial implementation of RFC 2315.
+ * Note: For the time being, this implementation of the PKCS #7 Cryptographic
+ * Message Syntax is a partial implementation of RFC 2315.
  * Differences include:
  *  - The RFC specifies 6 different content types. The only type currently
  *    supported in Mbed TLS is the signed data content type.