diff --git a/include/polarssl/config.h b/include/polarssl/config.h
index 8c95c42..0a64f6e 100644
--- a/include/polarssl/config.h
+++ b/include/polarssl/config.h
@@ -814,9 +814,9 @@
 #define POLARSSL_SSL_TRUNCATED_HMAC
 
 /**
- * \def POLARSSL_SSL_SET_ECDH_CURVES
+ * \def POLARSSL_SSL_SET_CURVES
  *
- * Enable ssl_set_ecdh_curves().
+ * Enable ssl_set_curves().
  *
  * This is disabled by default since it breaks binary compatibility with the
  * 1.3.x line. If you choose to enable it, you will need to rebuild your
@@ -825,9 +825,9 @@
  *
  * TODO: actually disable it when done working on this branch ,)
  *
- * Uncomment to make ssl_set_ecdh_curves() available.
+ * Uncomment to make ssl_set_curves() available.
  */
-#define POLARSSL_SSL_SET_ECDH_CURVES
+#define POLARSSL_SSL_SET_CURVES
 
 /**
  * \def POLARSSL_THREADING_ALT
diff --git a/include/polarssl/ssl.h b/include/polarssl/ssl.h
index 2fdc01d..3ab3629 100644
--- a/include/polarssl/ssl.h
+++ b/include/polarssl/ssl.h
@@ -728,8 +728,8 @@
     int allow_legacy_renegotiation;     /*!<  allow legacy renegotiation     */
     const int *ciphersuite_list[4];     /*!<  allowed ciphersuites / version */
 #if defined(POLARSSL_KEY_EXCHANGE__SOME__ECDHE_ENABLED) && \
-    defined(POLARSSL_SSL_SET_ECDH_CURVES)
-    const ecp_group_id *ecdh_curve_list;/*!<  allowed curves for ECDH */
+    defined(POLARSSL_SSL_SET_CURVES)
+    const ecp_group_id *curve_list;     /*!<  allowed curves                 */
 #endif
 #if defined(POLARSSL_SSL_TRUNCATED_HMAC)
     int trunc_hmac;                     /*!<  negotiate truncated hmac?      */
@@ -1160,7 +1160,7 @@
 #endif
 
 #if defined(POLARSSL_KEY_EXCHANGE__SOME__ECDHE_ENABLED) && \
-    defined(POLARSSL_SSL_SET_ECDH_CURVES)
+    defined(POLARSSL_SSL_SET_CURVES)
 /**
  * \brief          Set the allowed ECDH curves.
  *                 (Default: all defined curves.)
@@ -1169,10 +1169,9 @@
  *                 handshake curve preference.
  *
  * \param ssl      SSL context
- * \param ecdh_curve_list Zero terminated list of the allowed ECDH curves
+ * \param curves   Zero terminated list of the allowed ECDH curves
  */
-void ssl_set_ecdh_curves( ssl_context *ssl,
-                          const ecp_group_id *ecdh_curve_list );
+void ssl_set_curves( ssl_context *ssl, const ecp_group_id *curves );
 #endif
 
 #if defined(POLARSSL_SSL_SERVER_NAME_INDICATION)