diff --git a/include/mbedtls/x509_crt.h b/include/mbedtls/x509_crt.h
index 42ae671a..cd089ce 100644
--- a/include/mbedtls/x509_crt.h
+++ b/include/mbedtls/x509_crt.h
@@ -588,8 +588,8 @@
  *                 SAN type.
  * \return         Another negative value for any other failure.
  */
-int mbedtls_x509_parse_general_name(const mbedtls_x509_buf *san_buf,
-                                    mbedtls_x509_subject_alternative_name *san);
+int mbedtls_x509_parse_subject_alt_name(const mbedtls_x509_buf *san_buf,
+                                        mbedtls_x509_subject_alternative_name *san);
 
 #if !defined(MBEDTLS_X509_REMOVE_INFO)
 /**
diff --git a/library/x509_crt.c b/library/x509_crt.c
index 40bffb4..476c162 100644
--- a/library/x509_crt.c
+++ b/library/x509_crt.c
@@ -685,7 +685,7 @@
         /*
          * Check that the SAN is structured correctly.
          */
-        ret = mbedtls_x509_parse_general_name(&(cur->buf), &dummy_san_buf);
+        ret = mbedtls_x509_parse_subject_alt_name(&(cur->buf), &dummy_san_buf);
         /*
          * In case the extension is malformed, return an error,
          * and clear the allocated sequences.
@@ -1798,7 +1798,7 @@
 
     while (cur != NULL) {
         memset(&san, 0, sizeof(san));
-        parse_ret = mbedtls_x509_parse_general_name(&cur->buf, &san);
+        parse_ret = mbedtls_x509_parse_subject_alt_name(&cur->buf, &san);
         if (parse_ret != 0) {
             if (parse_ret == MBEDTLS_ERR_X509_FEATURE_UNAVAILABLE) {
                 ret = mbedtls_snprintf(p, n, "\n%s    <unsupported>", prefix);
@@ -1888,8 +1888,8 @@
     return 0;
 }
 
-int mbedtls_x509_parse_general_name(const mbedtls_x509_buf *san_buf,
-                                    mbedtls_x509_subject_alternative_name *san)
+int mbedtls_x509_parse_subject_alt_name(const mbedtls_x509_buf *san_buf,
+                                        mbedtls_x509_subject_alternative_name *san)
 {
     int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
     switch (san_buf->tag &
diff --git a/tests/suites/test_suite_x509parse.function b/tests/suites/test_suite_x509parse.function
index 4f80b64..921b3fd 100644
--- a/tests/suites/test_suite_x509parse.function
+++ b/tests/suites/test_suite_x509parse.function
@@ -458,7 +458,7 @@
     if (crt.ext_types & MBEDTLS_X509_EXT_SUBJECT_ALT_NAME) {
         cur = &crt.subject_alt_names;
         while (cur != NULL) {
-            ret = mbedtls_x509_parse_general_name(&cur->buf, &san);
+            ret = mbedtls_x509_parse_subject_alt_name(&cur->buf, &san);
             TEST_ASSERT(ret == 0 || ret == MBEDTLS_ERR_X509_FEATURE_UNAVAILABLE);
             /*
              * If san type not supported, ignore.