diff --git a/constantine/math/arithmetic/bigints.nim b/constantine/math/arithmetic/bigints.nim
index 9b04ab6c..97bce194 100644
--- a/constantine/math/arithmetic/bigints.nim
+++ b/constantine/math/arithmetic/bigints.nim
@@ -570,7 +570,7 @@ func invmod_vartime*[bits](r: var BigInt[bits], a, M: BigInt[bits]) {.tags: [Var
 #   Blake, Seroussi, Smart, 1999
 #
 # - Efficient Arithmetic on Koblitz Curves
-#   Jerome Name. Solinas, 2000
+#   Jerome A. Solinas, 2000
 #   https://decred.org/research/solinas2000.pdf
 #
 # - Optimal Left-to-Right Binary Signed-Digit Recoding
diff --git a/constantine/math/elliptic/ec_endomorphism_accel.nim b/constantine/math/elliptic/ec_endomorphism_accel.nim
index 46c05b76..39bef570 100644
--- a/constantine/math/elliptic/ec_endomorphism_accel.nim
+++ b/constantine/math/elliptic/ec_endomorphism_accel.nim
@@ -51,7 +51,7 @@ template decomposeEndoImpl[scalBits: static int](
   static: doAssert L >= ceilDiv_vartime(scalBits, M) + 1
   const w = Fr[F.Name].bits().wordsRequired()
 
-  # Upstream bug:Fr[T.Name].bits()
+  # Upstream bug:
   #   {.noInit.} variables must be {.inject.} as well
   #   or they'll be mangled as foo`gensym12345 instead of fooX60gensym12345 in C codegen
 
diff --git a/constantine/math/pairings/miller_accumulators.nim b/constantine/math/pairings/miller_accumulators.nim
index c616bb53..b86538f1 100644
--- a/constantine/math/pairings/miller_accumulators.nim
+++ b/constantine/math/pairings/miller_accumulators.nim
@@ -28,7 +28,7 @@ import
 # See ./multi-pairing.md for 2 approaches to a miller loop accumulator:
 #
 # - Software Implementation, Algorithm 11.2 & 11.3
-#   Aranha, Dominguez Perez, Name. Mrabet, Schwabe,
+#   Aranha, Dominguez Perez, Mrabet, Schwabe,
 #   Guide to Pairing-Based Cryptography, 2015
 #
 # - Pairing Implementation Revisited
diff --git a/constantine/math/pairings/miller_loops.nim b/constantine/math/pairings/miller_loops.nim
index 9d40ea55..0d31362f 100644
--- a/constantine/math/pairings/miller_loops.nim
+++ b/constantine/math/pairings/miller_loops.nim
@@ -121,7 +121,7 @@ func millerCorrectionBN*[FT, F1, F2](
 # ############################################################
 #
 # - Software Implementation, Algorithm 11.2 & 11.3
-#   Aranha, Dominguez Perez, Name. Mrabet, Schwabe,
+#   Aranha, Dominguez Perez, Mrabet, Schwabe,
 #   Guide to Pairing-Based Cryptography, 2015
 #
 # - Physical Attacks,
diff --git a/constantine/math_arbitrary_precision/arithmetic/limbs_views.nim b/constantine/math_arbitrary_precision/arithmetic/limbs_views.nim
index 1f2b43ac..b58ff42b 100644
--- a/constantine/math_arbitrary_precision/arithmetic/limbs_views.nim
+++ b/constantine/math_arbitrary_precision/arithmetic/limbs_views.nim
@@ -79,7 +79,7 @@ func copyWords*(
        a: LimbsViewMut, startA: int,
        b: LimbsViewAny, startB: int,
        numWords: int) {.inline.} =
-  ## Copy a slice of B into Name. This properly deals
+  ## Copy a slice of B into A. This properly deals
   ## with overlaps when A and B are slices of the same buffer
   if startA > startB:
     for i in countdown(numWords-1, 0):
@@ -93,7 +93,7 @@ func ccopyWords*(
        b: LimbsViewAny, startB: int,
        ctl: SecretBool,
        numWords: int) {.inline.} =
-  ## Copy a slice of B into Name. This properly deals
+  ## Copy a slice of B into A. This properly deals
   ## with overlaps when A and B are slices of the same buffer
   if startA > startB:
     for i in countdown(numWords-1, 0):
diff --git a/constantine/threadpool/threadpool.nim b/constantine/threadpool/threadpool.nim
index 45d802fc..075fe26a 100644
--- a/constantine/threadpool/threadpool.nim
+++ b/constantine/threadpool/threadpool.nim
@@ -425,7 +425,7 @@ proc schedule(ctx: var WorkerContext, task: ptr Task, forceWake = false) {.inlin
 
 # Inpired by
 # - Lazy binary-splitting: a run-time adaptive work-stealing scheduler.
-#   Tzannes, Name., G. C. Caragea, R. Barua, and U. Vishkin.
+#   A. Tzannes, G. C. Caragea, R. Barua, and U. Vishkin.
 #   In PPoPP ’10, Bangalore, India, January 2010. ACM, pp. 179–190.
 #   https://user.eng.umd.edu/~barua/ppopp164.pdf
 # - Embracing Explicit Communication in Work-Stealing Runtime Systems.
diff --git a/metering/README.md b/metering/README.md
index 25483956..af625869 100644
--- a/metering/README.md
+++ b/metering/README.md
@@ -32,9 +32,9 @@ func random_point*(rng: var RngState, EC: typedesc): EC {.noInit.} =
   result = rng.random_unsafe(EC)
   result.clearCofactor()
 
-proc pairingBLS12Meter*(A: NamedAlgebra) =
+proc pairingBLS12Meter*(C: static Curve) =
   let
-    P = rng.random_point(ECP_ShortW_Prj[Fp[A], G1])
+    P = rng.random_point(ECP_ShortW_Prj[Fp[C], G1])
     Q = rng.random_point(ECP_ShortW_Prj[Fp2[C], G2])
 
   var f: Fp12[C]