diff --git a/include/mbedtls/ssl_internal.h b/include/mbedtls/ssl_internal.h
index 01458c52f..866d7f85b 100644
--- a/include/mbedtls/ssl_internal.h
+++ b/include/mbedtls/ssl_internal.h
@@ -646,9 +646,9 @@ struct mbedtls_ssl_transform
  *
  */
 #if MBEDTLS_SSL_CID_OUT_LEN_MAX > MBEDTLS_SSL_CID_IN_LEN_MAX
-#define SSL_CID_LEN_MAX MBEDTLS_SSL_CID_OUT_LEN_MAX
+#define MBEDTLS_SSL_CID_LEN_MAX MBEDTLS_SSL_CID_OUT_LEN_MAX
 #else
-#define SSL_CID_LEN_MAX MBEDTLS_SSL_CID_IN_LEN_MAX
+#define MBEDTLS_SSL_CID_LEN_MAX MBEDTLS_SSL_CID_IN_LEN_MAX
 #endif
 
 typedef struct
@@ -664,7 +664,7 @@ typedef struct
 
 #if defined(MBEDTLS_SSL_CID)
     uint8_t cid_len;
-    unsigned char cid[ SSL_CID_LEN_MAX ];
+    unsigned char cid[ MBEDTLS_SSL_CID_LEN_MAX ];
 #endif /* MBEDTLS_SSL_CID */
 
 } mbedtls_record;
diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index c558a848a..9afc7996e 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -2049,7 +2049,7 @@ static int ssl_cid_parse_inner_plaintext( unsigned char const *content,
 }
 #endif /* MBEDTLS_SSL_CID */
 
-/* add_data must have size ( 13 + SSL_CID_LEN_MAX ) Bytes */
+/* add_data must have size ( 13 + MBEDTLS_SSL_CID_LEN_MAX ) Bytes */
 static void ssl_extract_add_data_from_record( unsigned char* add_data,
                                               size_t *add_data_len,
                                               mbedtls_record *rec )
@@ -2095,7 +2095,7 @@ int mbedtls_ssl_encrypt_buf( mbedtls_ssl_context *ssl,
     mbedtls_cipher_mode_t mode;
     int auth_done = 0;
     unsigned char * data;
-    unsigned char add_data[13 + SSL_CID_LEN_MAX ];
+    unsigned char add_data[13 + MBEDTLS_SSL_CID_LEN_MAX ];
     size_t add_data_len;
     size_t post_avail;
 
@@ -2532,7 +2532,7 @@ int mbedtls_ssl_decrypt_buf( mbedtls_ssl_context *ssl,
     size_t padlen = 0, correct = 1;
 #endif
     unsigned char* data;
-    unsigned char add_data[13 + SSL_CID_LEN_MAX ];
+    unsigned char add_data[13 + MBEDTLS_SSL_CID_LEN_MAX ];
     size_t add_data_len;
 
 #if !defined(MBEDTLS_DEBUG_C)