diff --git a/include/mbedtls/check_config.h b/include/mbedtls/check_config.h
index 97dcc02..2a2f19c 100644
--- a/include/mbedtls/check_config.h
+++ b/include/mbedtls/check_config.h
@@ -915,8 +915,8 @@
 #endif
 
 
-#if defined(MBEDTLS_EARLY_KEY_COMPUTATION) && !defined(MBEDTLS_USE_TINYCRYPT)
-#error "MBEDTLS_EARLY_KEY_COMPUTATION can only be used with MBEDTLS_USE_TINYCRYPT"
+#if defined(MBEDTLS_SSL_EARLY_KEY_COMPUTATION) && !defined(MBEDTLS_USE_TINYCRYPT)
+#error "MBEDTLS_SSL_EARLY_KEY_COMPUTATION can only be used with MBEDTLS_USE_TINYCRYPT"
 #endif
 
 /*
diff --git a/include/mbedtls/config.h b/include/mbedtls/config.h
index 0fca50a..d9b6922 100644
--- a/include/mbedtls/config.h
+++ b/include/mbedtls/config.h
@@ -1625,14 +1625,14 @@
 //#define MBEDTLS_SSL_IMMEDIATE_TRANSMISSION
 
 /**
- * \def MBEDTLS_EARLY_KEY_COMPUTATION
+ * \def MBEDTLS_SSL_EARLY_KEY_COMPUTATION
  *
  * Create ephemeral Diffie-Hellman key pair after
  * the ClientHello has been successfully transmitted.
  *
  * Requires:
  */
-//#define MBEDTLS_EARLY_KEY_COMPUTATION
+//#define MBEDTLS_SSL_EARLY_KEY_COMPUTATION
 
 /**
  * \def MBEDTLS_SSL_HW_RECORD_ACCEL
diff --git a/include/mbedtls/ssl_internal.h b/include/mbedtls/ssl_internal.h
index bd2169e..5d8f6fd 100644
--- a/include/mbedtls/ssl_internal.h
+++ b/include/mbedtls/ssl_internal.h
@@ -573,10 +573,10 @@
 
 #if defined(MBEDTLS_USE_TINYCRYPT)
     uint8_t ecdh_privkey[NUM_ECC_BYTES];
-#if defined(MBEDTLS_EARLY_KEY_COMPUTATION)
+#if defined(MBEDTLS_SSL_EARLY_KEY_COMPUTATION)
     uint8_t ecdhe_computed;
     uint8_t ecdh_publickey[2*NUM_ECC_BYTES];
-#endif /* MBEDTLS_EARLY_KEY_COMPUTATION */
+#endif /* MBEDTLS_SSL_EARLY_KEY_COMPUTATION */
     uint8_t ecdh_peerkey[2*NUM_ECC_BYTES];
 #endif /* MBEDTLS_USE_TINYCRYPT */