diff --git a/library/ssl_msg.c b/library/ssl_msg.c
index 70b69436c4..87598366d7 100644
--- a/library/ssl_msg.c
+++ b/library/ssl_msg.c
@@ -4931,8 +4931,8 @@ int mbedtls_ssl_handle_message_type(mbedtls_ssl_context *ssl)
         if (ssl->in_msg[0] == MBEDTLS_SSL_ALERT_LEVEL_FATAL) {
             MBEDTLS_SSL_DEBUG_MSG(1, ("is a fatal alert message (msg %d)",
                                       ssl->in_msg[1]));
-            ssl->in_alert_recv = 1;
-            ssl->in_alert_type = ssl->in_msg[1];
+            ssl->in_fatal_alert_recv = 1;
+            ssl->in_fatal_alert_type = ssl->in_msg[1];
             return MBEDTLS_ERR_SSL_FATAL_ALERT_MESSAGE;
         }
 
@@ -5017,12 +5017,12 @@ int mbedtls_ssl_send_alert_message(mbedtls_ssl_context *ssl,
     return 0;
 }
 
-int mbedtls_ssl_get_alert(mbedtls_ssl_context *ssl)
+int mbedtls_ssl_get_fatal_alert(const mbedtls_ssl_context *ssl)
 {
-    if (ssl == NULL || ssl->in_alert_recv != 1) {
+    if (ssl == NULL || ssl->in_fatal_alert_recv != 1) {
         return MBEDTLS_ERR_SSL_BAD_INPUT_DATA;
     }
-    return ssl->in_alert_type;
+    return ssl->in_fatal_alert_type;
 }
 
 int mbedtls_ssl_write_change_cipher_spec(mbedtls_ssl_context *ssl)
diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 23ec7b40c7..102de743b2 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -1296,8 +1296,8 @@ void mbedtls_ssl_session_reset_msg_layer(mbedtls_ssl_context *ssl,
         memset(ssl->in_buf, 0, in_buf_len);
     }
 
-    ssl->in_alert_recv = 0;
-    ssl->in_alert_type = 0;
+    ssl->in_fatal_alert_recv = 0;
+    ssl->in_fatal_alert_type = 0;
 
     ssl->send_alert = 0;
 
diff --git a/tests/suites/test_suite_ssl.function b/tests/suites/test_suite_ssl.function
index 79881b9834..628a183853 100644
--- a/tests/suites/test_suite_ssl.function
+++ b/tests/suites/test_suite_ssl.function
@@ -5956,10 +5956,10 @@ void ssl_get_alert_after_fatal(void)
     TEST_ASSERT(mbedtls_ssl_setup(&ssl, &conf) == 0);
 
     /* Invalid ssl context */
-    TEST_ASSERT(mbedtls_ssl_get_alert(NULL) == MBEDTLS_ERR_SSL_BAD_INPUT_DATA);
+    TEST_ASSERT(mbedtls_ssl_get_fatal_alert(NULL) == MBEDTLS_ERR_SSL_BAD_INPUT_DATA);
 
     /* No alert has been received yet */
-    TEST_ASSERT(mbedtls_ssl_get_alert(&ssl) == MBEDTLS_ERR_SSL_BAD_INPUT_DATA);
+    TEST_ASSERT(mbedtls_ssl_get_fatal_alert(&ssl) == MBEDTLS_ERR_SSL_BAD_INPUT_DATA);
 
     // prepare input message buffer with fatal alert
     ssl.in_msglen = 2;
@@ -5969,11 +5969,11 @@ void ssl_get_alert_after_fatal(void)
 
     /* import prepared fatal alert and test getter */
     TEST_ASSERT(mbedtls_ssl_handle_message_type(&ssl) == MBEDTLS_ERR_SSL_FATAL_ALERT_MESSAGE);
-    TEST_ASSERT(mbedtls_ssl_get_alert(&ssl) == MBEDTLS_SSL_ALERT_MSG_HANDSHAKE_FAILURE);
+    TEST_ASSERT(mbedtls_ssl_get_fatal_alert(&ssl) == MBEDTLS_SSL_ALERT_MSG_HANDSHAKE_FAILURE);
 
     /* Reset the session and check that no alert is present*/
     mbedtls_ssl_session_reset_msg_layer(&ssl, 0);
-    TEST_ASSERT(mbedtls_ssl_get_alert(&ssl) == MBEDTLS_ERR_SSL_BAD_INPUT_DATA);
+    TEST_ASSERT(mbedtls_ssl_get_fatal_alert(&ssl) == MBEDTLS_ERR_SSL_BAD_INPUT_DATA);
 
 exit:
     mbedtls_ssl_free(&ssl);