diff --git a/src/bls12_381/ec.rs b/src/bls12_381/ec.rs
index 2f39940..973bdbf 100644
--- a/src/bls12_381/ec.rs
+++ b/src/bls12_381/ec.rs
@@ -27,7 +27,7 @@ macro_rules! curve_impl {
             }
         }
 
-        #[derive(Copy, Clone, Eq, Debug)]
+        #[derive(Copy, Clone, Debug, Eq)]
         pub struct $projective {
            pub(crate) x: $basefield,
            pub(crate) y: $basefield,
@@ -577,7 +577,7 @@ pub mod g1 {
     use super::super::{Fq, Fr, FrRepr, FqRepr};
     use ::{CurveProjective, CurveAffine, PrimeField, SqrtField, PrimeFieldRepr, Field, BitIterator, EncodedPoint, GroupDecodingError};
 
-    curve_impl!("E", G1, G1Affine, G1Prepared, Fq, Fr, G1Uncompressed, G1Compressed);
+    curve_impl!("G1", G1, G1Affine, G1Prepared, Fq, Fr, G1Uncompressed, G1Compressed);
 
     #[derive(Copy)]
     pub struct G1Uncompressed([u8; 96]);
@@ -1125,7 +1125,7 @@ pub mod g2 {
     use super::super::{Fq2, Fr, Fq, FrRepr, FqRepr};
     use ::{CurveProjective, CurveAffine, PrimeField, SqrtField, PrimeFieldRepr, Field, BitIterator, EncodedPoint, GroupDecodingError};
 
-    curve_impl!("E'", G2, G2Affine, G2Prepared, Fq2, Fr, G2Uncompressed, G2Compressed);
+    curve_impl!("G2", G2, G2Affine, G2Prepared, Fq2, Fr, G2Uncompressed, G2Compressed);
 
     #[derive(Copy)]
     pub struct G2Uncompressed([u8; 192]);
diff --git a/src/bls12_381/fq12.rs b/src/bls12_381/fq12.rs
index 42ad3b4..e918505 100644
--- a/src/bls12_381/fq12.rs
+++ b/src/bls12_381/fq12.rs
@@ -5,7 +5,7 @@ use super::fq2::Fq2;
 use super::fq::{FROBENIUS_COEFF_FQ12_C1};
 
 /// An element of Fq12, represented by c0 + c1 * w.
-#[derive(Copy, Clone, Eq, PartialEq, Debug)]
+#[derive(Copy, Clone, Debug, Eq, PartialEq)]
 pub struct Fq12 {
     pub c0: Fq6,
     pub c1: Fq6
diff --git a/src/bls12_381/fq2.rs b/src/bls12_381/fq2.rs
index fed09f6..a4d8e7c 100644
--- a/src/bls12_381/fq2.rs
+++ b/src/bls12_381/fq2.rs
@@ -5,7 +5,7 @@ use super::fq::{Fq, FROBENIUS_COEFF_FQ2_C1, NEGATIVE_ONE};
 use std::cmp::Ordering;
 
 /// An element of Fq2, represented by c0 + c1 * u.
-#[derive(Copy, Clone, Eq, PartialEq, Debug)]
+#[derive(Copy, Clone, Debug, Eq, PartialEq)]
 pub struct Fq2 {
     pub c0: Fq,
     pub c1: Fq
diff --git a/src/bls12_381/fq6.rs b/src/bls12_381/fq6.rs
index 419681b..2c62a92 100644
--- a/src/bls12_381/fq6.rs
+++ b/src/bls12_381/fq6.rs
@@ -4,7 +4,7 @@ use super::fq2::Fq2;
 use super::fq::{FROBENIUS_COEFF_FQ6_C1, FROBENIUS_COEFF_FQ6_C2};
 
 /// An element of Fq6, represented by c0 + c1 * v + c2 * v^2.
-#[derive(Copy, Clone, Eq, PartialEq, Debug)]
+#[derive(Copy, Clone, Debug, Eq, PartialEq)]
 pub struct Fq6 {
     pub c0: Fq2,
     pub c1: Fq2,