diff --git a/library/bignum_core.h b/library/bignum_core.h
index b079850d92..d9e16ee3b8 100644
--- a/library/bignum_core.h
+++ b/library/bignum_core.h
@@ -623,7 +623,7 @@ static inline size_t mbedtls_mpi_core_montmul_working_limbs( size_t AN_limbs )
  * \param[in]     A         The MPI to convert into Montgomery form.
  *                          Must have the same number of limbs as the modulus.
  * \param[in]     N         The address of the modulus, which gives the size of
- *                          the base `R` = 2^(biL*m->limbs).
+ *                          the base `R` = 2^(biL*N->limbs).
  * \param[in]     AN_limbs  The number of limbs in \p X, \p A, \p N and \p rr.
  * \param         mm        The Montgomery constant for \p N: -N^-1 mod 2^biL.
  *                          This can be determined by calling
@@ -661,7 +661,7 @@ void mbedtls_mpi_core_to_mont_rep( mbedtls_mpi_uint *X,
  * \param[in]     A         The MPI to convert from Montgomery form.
  *                          Must have the same number of limbs as the modulus.
  * \param[in]     N         The address of the modulus, which gives the size of
- *                          the base `R` = 2^(biL*m->limbs).
+ *                          the base `R` = 2^(biL*N->limbs).
  * \param[in]     AN_limbs  The number of limbs in \p X, \p A and \p N.
  * \param         mm        The Montgomery constant for \p N: -N^-1 mod 2^biL.
  *                          This can be determined by calling
diff --git a/scripts/mbedtls_dev/bignum_common.py b/scripts/mbedtls_dev/bignum_common.py
index dd4fc36840..c4efabfcc2 100644
--- a/scripts/mbedtls_dev/bignum_common.py
+++ b/scripts/mbedtls_dev/bignum_common.py
@@ -249,7 +249,7 @@ class ModOperationCommon(OperationCommon):
     #pylint: disable=abstract-method
     """Target for bignum mod_raw test case generation."""
     moduli = MODULI_DEFAULT # type: List[str]
-    mongtomgery_form_a = False
+    montgomery_form_a = False
     disallow_zero_a = False
 
     def __init__(self, val_n: str, val_a: str, val_b: str = "0",
@@ -272,7 +272,7 @@ class ModOperationCommon(OperationCommon):
 
     @property
     def arg_a(self) -> str:
-        if self.mongtomgery_form_a:
+        if self.montgomery_form_a:
             value_a = self.to_montgomery(self.int_a)
         else:
             value_a = self.int_a
diff --git a/scripts/mbedtls_dev/bignum_core.py b/scripts/mbedtls_dev/bignum_core.py
index 3bd7f111cf..24d37cbc72 100644
--- a/scripts/mbedtls_dev/bignum_core.py
+++ b/scripts/mbedtls_dev/bignum_core.py
@@ -757,7 +757,7 @@ class BignumCoreExpMod(BignumCoreTarget, bignum_common.ModOperationCommon):
     test_function = "mpi_core_exp_mod"
     test_name = "Core modular exponentiation (Mongtomery form only)"
     input_style = "fixed"
-    mongtomgery_form_a = True
+    montgomery_form_a = True
 
     def result(self) -> List[str]:
         # Result has to be given in Montgomery form too
diff --git a/scripts/mbedtls_dev/bignum_mod.py b/scripts/mbedtls_dev/bignum_mod.py
index 6428873541..25afe3053c 100644
--- a/scripts/mbedtls_dev/bignum_mod.py
+++ b/scripts/mbedtls_dev/bignum_mod.py
@@ -76,7 +76,7 @@ class BignumModInvMont(bignum_common.ModOperationCommon, BignumModTarget):
     arity = 1
     suffix = True
     disallow_zero_a = True
-    mongtomgery_form_a = True
+    montgomery_form_a = True
 
     def result(self) -> List[str]:
         result = bignum_common.invmod_positive(self.int_a, self.int_n)
diff --git a/scripts/mbedtls_dev/bignum_mod_raw.py b/scripts/mbedtls_dev/bignum_mod_raw.py
index 461b1f2b9a..ae855e829a 100644
--- a/scripts/mbedtls_dev/bignum_mod_raw.py
+++ b/scripts/mbedtls_dev/bignum_mod_raw.py
@@ -64,7 +64,7 @@ class BignumModRawInvPrime(bignum_common.ModOperationCommon,
     input_style = "arch_split"
     arity = 1
     suffix = True
-    mongtomgery_form_a = True
+    montgomery_form_a = True
     disallow_zero_a = True
 
     def result(self) -> List[str]: