diff --git a/CHANGES b/CHANGES
index dc55a7d1fbfd7dbd4f6cc2e9737c6d929fae0791..c516fe70873743d0ab90e21ac7daa8e671e7cf4f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -23,14 +23,14 @@
   *) Framework for elliptic curves (crypto/ec/ec.h, crypto/ec/ec_lcl.h,
      crypto/ec/ec_lib.c):
 
-     Curves are EC_GROUP objects (with an optional generator) based
-     on EC_METHODs that are built into the library.
+     Curves are EC_GROUP objects (with an optional group generator)
+     based on EC_METHODs that are built into the library.
 
      Points are EC_POINT objects based on EC_GROUP objects.
 
      Most of the framework would be able to handle curves over arbitrary
-     finite fields, but as there are no obvious types for GF(2^n),
-     some functions are limited to GF(p) for now.
+     finite fields, but as there are no obvious types for fields other
+     than GF(p), some functions are limited to that for now.
      [Bodo Moeller]
 
   *) Add the -HTTP option to s_server.  It is similar to -WWW, but requires
diff --git a/crypto/ec/ec.h b/crypto/ec/ec.h
index 87c1f457c31323e7c09c80952c572f67e71fadff..084244457df520915311f5fe17c10b04b93ece5e 100644
--- a/crypto/ec/ec.h
+++ b/crypto/ec/ec.h
@@ -226,11 +226,11 @@ void ERR_load_EC_strings(void);
 #define EC_R_INVALID_FIELD				 103
 #define EC_R_INVALID_FORM				 104
 #define EC_R_NOT_INITIALIZED				 111
-#define EC_R_NO_GENERATOR_SET				 113
 #define EC_R_NO_SUCH_EXTRA_DATA				 105
 #define EC_R_POINT_AT_INFINITY				 106
 #define EC_R_POINT_IS_NOT_ON_CURVE			 107
 #define EC_R_SLOT_FULL					 108
+#define EC_R_UNDEFINED_GENERATOR			 113
 
 #ifdef  __cplusplus
 }
diff --git a/crypto/ec/ec_err.c b/crypto/ec/ec_err.c
index 7dd1131f630694187682139deb8e5c728618fbe9..f88501502eff266cfe62d1ed29ce39fb258832ee 100644
--- a/crypto/ec/ec_err.c
+++ b/crypto/ec/ec_err.c
@@ -122,11 +122,11 @@ static ERR_STRING_DATA EC_str_reasons[]=
 {EC_R_INVALID_FIELD                      ,"invalid field"},
 {EC_R_INVALID_FORM                       ,"invalid form"},
 {EC_R_NOT_INITIALIZED                    ,"not initialized"},
-{EC_R_NO_GENERATOR_SET                   ,"no generator set"},
 {EC_R_NO_SUCH_EXTRA_DATA                 ,"no such extra data"},
 {EC_R_POINT_AT_INFINITY                  ,"point at infinity"},
 {EC_R_POINT_IS_NOT_ON_CURVE              ,"point is not on curve"},
 {EC_R_SLOT_FULL                          ,"slot full"},
+{EC_R_UNDEFINED_GENERATOR                ,"undefined generator"},
 {0,NULL}
 	};
 
diff --git a/crypto/ec/ec_mult.c b/crypto/ec/ec_mult.c
index 0515e728ec4a1e8c2ff37578b49163ca1a814ada..ddd3db592154f0df8b235f21e453a665ed412afe 100644
--- a/crypto/ec/ec_mult.c
+++ b/crypto/ec/ec_mult.c
@@ -72,7 +72,7 @@
 	 	 (b) >  23 ? 3 : 1)
 
 /* Compute
- *      \sum scalar[i]*points[i]
+ *      \sum scalars[i]*points[i]
  * where
  *      scalar*generator
  * is included in the addition if scalar != NULL
@@ -103,7 +103,7 @@ int EC_POINTs_mul(const EC_GROUP *group, EC_POINT *r, BIGNUM *scalar,
 		generator = EC_GROUP_get0_generator(group);
 		if (generator == NULL)
 			{
-			ECerr(EC_F_EC_POINTS_MUL, EC_R_NO_GENERATOR_SET);
+			ECerr(EC_F_EC_POINTS_MUL, EC_R_UNDEFINED_GENERATOR);
 			return 0;
 			}
 		}