diff --git a/CHANGES b/CHANGES
index 589d9fc46f3e68e65dcd615c4175f7d0b8bc22b1..96ff52c52a580424767993d5dd3d4faf82273d09 100644
--- a/CHANGES
+++ b/CHANGES
@@ -774,14 +774,14 @@
   *) Include some named elliptic curves, and add OIDs from X9.62,
      SECG, and WAP/WTLS.  Each curve can be obtained from the new
      function
-          EC_GROUP_new_by_nid(),
+          EC_GROUP_new_by_curve_name(),
      and the list of available named curves can be obtained with
           EC_get_builtin_curves().
      Also add a 'curve_name' member to EC_GROUP objects, which can be
      accessed via
          EC_GROUP_set_curve_name()
          EC_GROUP_get_curve_name()
-     [Nils Larsch <nla@trustcenter.de, Bodo Moeller]
+     [Nils Larsch <larsch@trustcenter.de, Bodo Moeller]
  
   *) Remove a few calls to bn_wexpand() in BN_sqr() (the one in there
      was actually never needed) and in BN_mul().  The removal in BN_mul()
diff --git a/apps/ecparam.c b/apps/ecparam.c
index 181cccc5c3c005d4018a99d7cc92c885806e303b..b9786288d958ffedc62876a751065177aa524a2a 100644
--- a/apps/ecparam.c
+++ b/apps/ecparam.c
@@ -411,7 +411,7 @@ bad:
 			goto end;
 			}
 
-		group = EC_GROUP_new_by_nid(nid);
+		group = EC_GROUP_new_by_curve_name(nid);
 		if (group == NULL)
 			{
 			BIO_printf(bio_err, "unable to create curve (%s)\n", 
diff --git a/apps/s_server.c b/apps/s_server.c
index a5e8bcd024e7a549b4fdb4bceab5691474f9ea28..ea19a50bff8f65c564f1f667fea18c42108d13dd 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -999,7 +999,7 @@ bad:
 				goto end;
 				}
 
-			ecdh->group = EC_GROUP_new_by_nid(nid);
+			ecdh->group = EC_GROUP_new_by_curve_name(nid);
 			if (ecdh->group == NULL)
 				{
 				BIO_printf(bio_err, "unable to create curve (%s)\n", 
@@ -1015,7 +1015,7 @@ bad:
 		else
 			{
 			BIO_printf(bio_s_out,"Using default temp ECDH parameters\n");
-			ecdh->group=EC_GROUP_new_by_nid(NID_sect163r2);
+			ecdh->group=EC_GROUP_new_by_curve_name(NID_sect163r2);
 			if (ecdh->group == NULL) 
 				{
 				BIO_printf(bio_err, "unable to create curve (sect163r2)\n");
diff --git a/apps/speed.c b/apps/speed.c
index b22acd16462aff5c4302d712e69ca85d6ba0f32f..bd5b217b57799835710024dbb403ee93ca015105 100644
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -2049,7 +2049,7 @@ int MAIN(int argc, char **argv)
 			} 
 		else 
 			{
-			ecdsa[j]->group = EC_GROUP_new_by_nid(test_curves[j]);
+			ecdsa[j]->group = EC_GROUP_new_by_curve_name(test_curves[j]);
 			/* Could not obtain group information */
 			if (ecdsa[j]->group == NULL) 
 				{
@@ -2168,7 +2168,7 @@ int MAIN(int argc, char **argv)
 			}
 		else
 			{
-			ecdh_a[j]->group = EC_GROUP_new_by_nid(test_curves[j]);
+			ecdh_a[j]->group = EC_GROUP_new_by_curve_name(test_curves[j]);
 			if (ecdh_a[j]->group == NULL)
 				{
 				BIO_printf(bio_err,"ECDH failure.\n");
diff --git a/crypto/asn1/x_pubkey.c b/crypto/asn1/x_pubkey.c
index c3bfd8db37b816d13d6631cf42a28251c4fa9655..c371e4c4cd3375bbc9280e63328775540df70a3a 100644
--- a/crypto/asn1/x_pubkey.c
+++ b/crypto/asn1/x_pubkey.c
@@ -338,7 +338,7 @@ EVP_PKEY *X509_PUBKEY_get(X509_PUBKEY *key)
 			eckey = ret->pkey.eckey;
 			if (eckey->group)
 				EC_GROUP_free(eckey->group);
-			if ((eckey->group = EC_GROUP_new_by_nid(
+			if ((eckey->group = EC_GROUP_new_by_curve_name(
                              OBJ_obj2nid(a->parameter->value.object))) == NULL)
 				goto err;
 			EC_GROUP_set_asn1_flag(eckey->group, 
diff --git a/crypto/ec/ec.h b/crypto/ec/ec.h
index 6b90e7a8fd21cff62409d9f6a11be039fc557230..cc608c74c8a208bbcd7ae0a2e2c6d02ee7d64213 100644
--- a/crypto/ec/ec.h
+++ b/crypto/ec/ec.h
@@ -178,8 +178,9 @@ int EC_GROUP_cmp(const EC_GROUP *, const EC_GROUP *, BN_CTX *);
 EC_GROUP *EC_GROUP_new_curve_GFp(const BIGNUM *p, const BIGNUM *a, const BIGNUM *b, BN_CTX *);
 EC_GROUP *EC_GROUP_new_curve_GF2m(const BIGNUM *p, const BIGNUM *a, const BIGNUM *b, BN_CTX *);
 
-/* EC_GROUP_new_by_nid() creates a EC_GROUP structure specified by a NID */
-EC_GROUP *EC_GROUP_new_by_nid(int nid);
+/* EC_GROUP_new_by_curve_name() creates a EC_GROUP structure
+ * specified by a curve name (in form of a NID) */
+EC_GROUP *EC_GROUP_new_by_curve_name(int nid);
 /* handling of internal curves */
 typedef struct { 
 	int nid;
@@ -428,7 +429,7 @@ void ERR_load_EC_strings(void);
 #define EC_F_EC_GROUP_GET_TRINOMIAL_BASIS		 194
 #define EC_F_EC_GROUP_GROUP2NID				 147
 #define EC_F_EC_GROUP_NEW				 108
-#define EC_F_EC_GROUP_NEW_BY_NID			 174
+#define EC_F_EC_GROUP_NEW_BY_CURVE_NAME			 174
 #define EC_F_EC_GROUP_NEW_FROM_DATA			 175
 #define EC_F_EC_GROUP_PRECOMPUTE_MULT			 142
 #define EC_F_EC_GROUP_SET_CURVE_GF2M			 176
diff --git a/crypto/ec/ec_asn1.c b/crypto/ec/ec_asn1.c
index 6c7de81eb7e6c57b213836a8f5a66d882abc48f9..5693201a26a94c9e37030b15208e8c70e7760089 100644
--- a/crypto/ec/ec_asn1.c
+++ b/crypto/ec/ec_asn1.c
@@ -967,7 +967,7 @@ EC_GROUP *ec_asn1_pkparameters2group(const ECPKPARAMETERS *params)
 	if (params->type == 0)
 		{ /* the curve is given by an OID */
 		tmp = OBJ_obj2nid(params->value.named_curve);
-		if ((ret = EC_GROUP_new_by_nid(tmp)) == NULL)
+		if ((ret = EC_GROUP_new_by_curve_name(tmp)) == NULL)
 			{
 			ECerr(EC_F_EC_ASN1_PKPARAMETERS2GROUP, 
 			      EC_R_EC_GROUP_NEW_BY_NAME_FAILURE);
diff --git a/crypto/ec/ec_curve.c b/crypto/ec/ec_curve.c
index 979f86530eac322668d75763b7e4d17e7cd6fa5d..923cb71e03c71ed85408d4644f2a9dc16a48a63a 100644
--- a/crypto/ec/ec_curve.c
+++ b/crypto/ec/ec_curve.c
@@ -1224,7 +1224,7 @@ err:
 	return group;
 	}
 
-EC_GROUP *EC_GROUP_new_by_nid(int nid)
+EC_GROUP *EC_GROUP_new_by_curve_name(int nid)
 	{
 	size_t i;
 	EC_GROUP *ret = NULL;
@@ -1241,7 +1241,7 @@ EC_GROUP *EC_GROUP_new_by_nid(int nid)
 
 	if (ret == NULL)
 		{
-		ECerr(EC_F_EC_GROUP_NEW_BY_NID, EC_R_UNKNOWN_GROUP);
+		ECerr(EC_F_EC_GROUP_NEW_BY_CURVE_NAME, EC_R_UNKNOWN_GROUP);
 		return NULL;
 		}
 
diff --git a/crypto/ec/ec_err.c b/crypto/ec/ec_err.c
index 4885f56901ce58a0dfa234772b6431e4753557f6..73c0055f016974a4ab68ecef137f0afea0024ed7 100644
--- a/crypto/ec/ec_err.c
+++ b/crypto/ec/ec_err.c
@@ -133,7 +133,7 @@ static ERR_STRING_DATA EC_str_functs[]=
 {ERR_FUNC(EC_F_EC_GROUP_GET_TRINOMIAL_BASIS),	"EC_GROUP_get_trinomial_basis"},
 {ERR_FUNC(EC_F_EC_GROUP_GROUP2NID),	"EC_GROUP_GROUP2NID"},
 {ERR_FUNC(EC_F_EC_GROUP_NEW),	"EC_GROUP_new"},
-{ERR_FUNC(EC_F_EC_GROUP_NEW_BY_NID),	"EC_GROUP_new_by_nid"},
+{ERR_FUNC(EC_F_EC_GROUP_NEW_BY_CURVE_NAME),	"EC_GROUP_new_by_curve_name"},
 {ERR_FUNC(EC_F_EC_GROUP_NEW_FROM_DATA),	"EC_GROUP_NEW_FROM_DATA"},
 {ERR_FUNC(EC_F_EC_GROUP_PRECOMPUTE_MULT),	"EC_GROUP_precompute_mult"},
 {ERR_FUNC(EC_F_EC_GROUP_SET_CURVE_GF2M),	"EC_GROUP_set_curve_GF2m"},
diff --git a/crypto/ec/ectest.c b/crypto/ec/ectest.c
index 92d2f671acc2652238046a40d6e6ee9735d65075..fdca4b4504baf61a11f114f45cf1088b91be3c69 100644
--- a/crypto/ec/ectest.c
+++ b/crypto/ec/ectest.c
@@ -1252,10 +1252,10 @@ void internal_curve_test(void)
 		{
 		EC_GROUP *group = NULL;
 		int nid = curves[n].nid;
-		if ((group = EC_GROUP_new_by_nid(nid)) == NULL)
+		if ((group = EC_GROUP_new_by_curve_name(nid)) == NULL)
 			{
 			ok = 0;
-			fprintf(stdout, "\nEC_GROUP_new_by_nid() failed with"
+			fprintf(stdout, "\nEC_GROUP_new_curve_name() failed with"
 				" curve %s\n", OBJ_nid2sn(nid));
 			/* try next curve */
 			continue;
diff --git a/crypto/ecdh/ecdhtest.c b/crypto/ecdh/ecdhtest.c
index 2a6baf4804d79ccf2273f40084cbadb0a2f50dac..f4e02966e202284d6340e3958803acf1d58facf0 100644
--- a/crypto/ecdh/ecdhtest.c
+++ b/crypto/ecdh/ecdhtest.c
@@ -132,7 +132,7 @@ int test_ecdh_curve(int nid, char *text, BN_CTX *ctx, BIO *out)
 	int i,alen,blen,aout,bout,ret=0;
 
 	if ((a=EC_KEY_new()) == NULL) goto err;
-	if ((a->group=EC_GROUP_new_by_nid(nid)) == NULL) goto err;
+	if ((a->group=EC_GROUP_new_by_curve_name(nid)) == NULL) goto err;
 
 	if ((b=EC_KEY_new()) == NULL) goto err;
 	b->group = a->group;
diff --git a/crypto/ecdsa/ecdsatest.c b/crypto/ecdsa/ecdsatest.c
index 44321c5ac6ca9c43d306935c026b4c34043035d7..5315d90dd2c3d26af32c39785554b01b61e373f4 100644
--- a/crypto/ecdsa/ecdsatest.c
+++ b/crypto/ecdsa/ecdsatest.c
@@ -203,7 +203,7 @@ int x9_62_test_internal(BIO *out, int nid, const char *r_in, const char *s_in)
 	/* create the key */
 	if ((key = EC_KEY_new()) == NULL)
 		goto x962_int_err;
-	if ((key->group = EC_GROUP_new_by_nid(nid)) == NULL)
+	if ((key->group = EC_GROUP_new_by_curve_name(nid)) == NULL)
 		goto x962_int_err;
 	if (!EC_KEY_generate_key(key))
 		goto x962_int_err;
@@ -337,7 +337,7 @@ int test_builtin(BIO *out)
 		/* create new ecdsa key (== EC_KEY) */
 		if ((eckey = EC_KEY_new()) == NULL)
 			goto builtin_err;
-		if ((eckey->group = EC_GROUP_new_by_nid(nid)) == NULL)
+		if ((eckey->group = EC_GROUP_new_by_curve_name(nid)) == NULL)
 			goto builtin_err;
 		if (EC_GROUP_get_degree(eckey->group) < 160)
 			/* drop the curve */ 
@@ -356,7 +356,7 @@ int test_builtin(BIO *out)
 		/* create second key */
 		if ((wrong_eckey = EC_KEY_new()) == NULL)
 			goto builtin_err;
-		if ((wrong_eckey->group = EC_GROUP_new_by_nid(nid)) == NULL)
+		if ((wrong_eckey->group = EC_GROUP_new_by_curve_name(nid)) == NULL)
 			goto builtin_err;
 		if (!EC_KEY_generate_key(wrong_eckey))
 			{
diff --git a/crypto/evp/evp_pkey.c b/crypto/evp/evp_pkey.c
index 41107686ec97e319f5528da44c2436ead9c799c6..bc74bde6378a2dbd783e4355bed26fd3c42a095f 100644
--- a/crypto/evp/evp_pkey.c
+++ b/crypto/evp/evp_pkey.c
@@ -262,7 +262,7 @@ EVP_PKEY *EVP_PKCS82PKEY (PKCS8_PRIV_KEY_INFO *p8)
 					ERR_R_MALLOC_FAILURE);
 				goto ecerr;
 			}
-			if ((eckey->group = EC_GROUP_new_by_nid(
+			if ((eckey->group = EC_GROUP_new_by_curve_name(
                              OBJ_obj2nid(a->parameter->value.object))) == NULL)
 				goto ecerr;
 			EC_GROUP_set_asn1_flag(eckey->group, 
diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c
index fc376cb04d8563981c1e6744c0c881c7966841dc..744748dd5b62c1e8fe7c9c06ff16880b324209cb 100644
--- a/ssl/s3_clnt.c
+++ b/ssl/s3_clnt.c
@@ -1214,7 +1214,7 @@ int ssl3_get_key_exchange(SSL *s)
 			goto f_err;
 			}
 
-		if (!(ecdh->group=EC_GROUP_new_by_nid(curve_nid)))
+		if (!(ecdh->group=EC_GROUP_new_by_curve_name(curve_nid)))
 			{
 			SSLerr(SSL_F_SSL3_GET_KEY_EXCHANGE,ERR_R_EC_LIB);
 			goto err;
diff --git a/ssl/ssltest.c b/ssl/ssltest.c
index 9e565fb8466ed4e1a4db08fc63ecf9a9cbe06ff8..d56f642869f20fb94e6e74b1e2608e4f0a79cbd7 100644
--- a/ssl/ssltest.c
+++ b/ssl/ssltest.c
@@ -734,7 +734,7 @@ bad:
 					goto end;
 					}
 
-				ecdh->group = EC_GROUP_new_by_nid(nid);
+				ecdh->group = EC_GROUP_new_by_curve_name(nid);
 				if (ecdh->group == NULL)
 					{
 					BIO_printf(bio_err, "unable to create curve (%s)\n", named_curve);
@@ -744,7 +744,7 @@ bad:
 				}
 			
 			if (ecdh->group == NULL)
-				ecdh->group=EC_GROUP_new_by_nid(NID_sect163r2);
+				ecdh->group=EC_GROUP_new_by_curve_name(NID_sect163r2);
 
 			SSL_CTX_set_tmp_ecdh(s_ctx, ecdh);
 			SSL_CTX_set_options(s_ctx, SSL_OP_SINGLE_ECDH_USE);
diff --git a/util/libeay.num b/util/libeay.num
index 0fc16572577ee1dc71c1b2b0351c2cb21e257868..ff69cae07881c0b1371796d3951893b48a320e54 100755
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -2906,7 +2906,7 @@ EC_POINT_set_affine_coords_GF2m         3340	EXIST:VMS:FUNCTION:EC
 BN_GF2m_mod_exp_arr                     3341	EXIST::FUNCTION:
 STORE_ATTR_INFO_modify_number           3342	EXIST::FUNCTION:
 X509_keyid_get0                         3343	EXIST::FUNCTION:
-EC_GROUP_new_by_nid                     3344	EXIST::FUNCTION:EC
+EC_GROUP_new_by_curve_name              3344	EXIST::FUNCTION:EC
 ENGINE_load_gmp                         3345	EXIST::FUNCTION:ENGINE,GMP,STATIC_ENGINE
 pitem_new                               3346	EXIST::FUNCTION:
 BN_GF2m_mod_mul_arr                     3347	EXIST::FUNCTION: