diff --git a/arm/ecc-192-modp.asm b/arm/ecc-192-modp.asm
index cee2a8c5ac94d80009ee726b6d9d4aabb371bac1..b6074a2e05e996df730236ac3c0aa31f76ee38af 100644
--- a/arm/ecc-192-modp.asm
+++ b/arm/ecc-192-modp.asm
@@ -33,7 +33,7 @@ ifelse(<
 	.file "ecc-192-modp.asm"
 	.arm
 
-define(<HP>, <r0>) C Overlaps unused ecc argument
+define(<HP>, <r0>) C Overlaps unused modulo argument
 define(<RP>, <r1>)
 
 define(<T0>, <r2>)
@@ -49,7 +49,7 @@ define(<H1>, <T1>)
 define(<C2>, <HP>)
 define(<C4>, <r12>)
 
-	C ecc_192_modp (const struct ecc_curve *ecc, mp_limb_t *rp)
+	C ecc_192_modp (const struct ecc_modulo *m, mp_limb_t *rp)
 	.text
 	.align 2
 
diff --git a/arm/ecc-224-modp.asm b/arm/ecc-224-modp.asm
index 4ec3058564e6d5de382656080c1553023afee5ed..15cc0c1b0f2650aeb61bee82d66a11b0604d2d56 100644
--- a/arm/ecc-224-modp.asm
+++ b/arm/ecc-224-modp.asm
@@ -34,7 +34,7 @@ ifelse(<
 	.arm
 
 define(<RP>, <r1>)
-define(<H>, <r0>) C Overlaps unused ecc argument
+define(<H>, <r0>) C Overlaps unused modulo argument
 
 define(<T0>, <r2>)
 define(<T1>, <r3>)
@@ -48,7 +48,7 @@ define(<L0>, <r11>)
 define(<L1>, <r12>)
 define(<L2>, <lr>)
 
-	C ecc_224_modp (const struct ecc_curve *ecc, mp_limb_t *rp)
+	C ecc_224_modp (const struct ecc_modulo *m, mp_limb_t *rp)
 	.text
 	.align 2
 
diff --git a/arm/ecc-256-redc.asm b/arm/ecc-256-redc.asm
index b7067dd188432c3854585efc73e98830a020e171..0c5e846d5890504a9b73d851ce1fec02989de6f5 100644
--- a/arm/ecc-256-redc.asm
+++ b/arm/ecc-256-redc.asm
@@ -35,7 +35,7 @@ ifelse(<
 
 define(<RP>, <r1>)
 
-define(<T0>, <r0>) C Overlaps unused ecc argument
+define(<T0>, <r0>) C Overlaps unused modulo argument
 define(<T1>, <r2>)
 define(<T2>, <r3>)
 define(<T3>, <r4>)
@@ -48,7 +48,7 @@ define(<F1>, <r11>)
 define(<F2>, <r12>)
 define(<F3>, <lr>)
 
-	C ecc_256_redc (const struct ecc_curve *ecc, mp_limb_t *rp)
+	C ecc_256_redc (const struct ecc_modulo *m, mp_limb_t *rp)
 	.text
 	.align 2
 
diff --git a/arm/ecc-384-modp.asm b/arm/ecc-384-modp.asm
index e48e66281aeb8e8f3573d6037ab103ec7373a1db..1d36319d584da68c3ae073f9c9a0ae4b4fe5f902 100644
--- a/arm/ecc-384-modp.asm
+++ b/arm/ecc-384-modp.asm
@@ -46,7 +46,7 @@ define(<F4>, <r10>)
 define(<N>, <r12>)
 define(<H>, <lr>)
 	
-	C ecc_384_modp (const struct ecc_curve *ecc, mp_limb_t *rp)
+	C ecc_384_modp (const struct ecc_modulo *m, mp_limb_t *rp)
 	.text
 	.align 2
 
diff --git a/arm/ecc-521-modp.asm b/arm/ecc-521-modp.asm
index 2ff940ec493bfe0041aede7a89adf1b072b3183c..c311a891f967f39db1cd96216651caed12e43eb8 100644
--- a/arm/ecc-521-modp.asm
+++ b/arm/ecc-521-modp.asm
@@ -45,7 +45,7 @@ define(<F3>, <r8>)
 define(<H>, <r12>)
 define(<N>, <lr>)
 
-	C ecc_521_modp (const struct ecc_curve *ecc, mp_limb_t *rp)
+	C ecc_521_modp (const struct ecc_modulo *m, mp_limb_t *rp)
 	.text
 .Lc511:
 	.int 511
diff --git a/x86_64/ecc-192-modp.asm b/x86_64/ecc-192-modp.asm
index 9024b46baaf98336f9f22504f0c98f55fefab11f..f0660525e0e15ee18088cc7ac961b3003f6cf04b 100644
--- a/x86_64/ecc-192-modp.asm
+++ b/x86_64/ecc-192-modp.asm
@@ -33,7 +33,7 @@ ifelse(<
 	.file "ecc-192-modp.asm"
 
 define(<RP>, <%rsi>)
-define(<T0>, <%rdi>) C Overlaps unused ecc input
+define(<T0>, <%rdi>) C Overlaps unused modulo input
 define(<T1>, <%rcx>)
 define(<T2>, <%rdx>)
 define(<T3>, <%r8>)
@@ -41,7 +41,7 @@ define(<H>, <%r9>)
 define(<C1>, <%r10>)
 define(<C2>, <%r11>)
 
-	C ecc_192_modp (const struct ecc_curve *ecc, mp_limb_t *rp)
+	C ecc_192_modp (const struct ecc_modulo *m, mp_limb_t *rp)
 	.text
 	ALIGN(16)
 PROLOGUE(nettle_ecc_192_modp)
diff --git a/x86_64/ecc-224-modp.asm b/x86_64/ecc-224-modp.asm
index 73e9b216d35b222f5fa2aad9cd23f58b87f65a41..282859c6b7b11c80bcdca53e82c996406a7733a2 100644
--- a/x86_64/ecc-224-modp.asm
+++ b/x86_64/ecc-224-modp.asm
@@ -33,7 +33,7 @@ ifelse(<
 	.file "ecc-224-modp.asm"
 
 define(<RP>, <%rsi>)
-define(<T0>, <%rdi>) C Overlaps unused ecc input
+define(<T0>, <%rdi>) C Overlaps unused modulo input
 define(<T1>, <%rcx>)
 define(<H0>, <%rax>)
 define(<H1>, <%rdx>)
@@ -42,6 +42,7 @@ define(<F0>, <%r9>)
 define(<F1>, <%r10>)
 define(<F2>, <%r11>)
 
+	C ecc_224_modp (const struct ecc_modulo *m, mp_limb_t *rp)
 PROLOGUE(nettle_ecc_224_modp)
 	W64_ENTRY(2, 0)
 	mov	48(RP), H0
diff --git a/x86_64/ecc-25519-modp.asm b/x86_64/ecc-25519-modp.asm
index b1622d5f1a72e3b0da5af60db6f265b4fc206d79..58c14fe0958eede88f6f6b68f639c227b12fc9b0 100644
--- a/x86_64/ecc-25519-modp.asm
+++ b/x86_64/ecc-25519-modp.asm
@@ -33,7 +33,7 @@ ifelse(<
 	.file "ecc-25519-modp.asm"
 
 define(<RP>, <%rsi>)
-define(<U0>, <%rdi>)	C Overlaps unused ecc input
+define(<U0>, <%rdi>)	C Overlaps unused modulo input
 define(<U1>, <%rcx>)
 define(<U2>, <%r8>)
 define(<U3>, <%r9>)
diff --git a/x86_64/ecc-256-redc.asm b/x86_64/ecc-256-redc.asm
index 56dfa174813c8506060cc73e3af6310f290a8eb3..fb1633541218eab886250091f3196be7f184c746 100644
--- a/x86_64/ecc-256-redc.asm
+++ b/x86_64/ecc-256-redc.asm
@@ -33,7 +33,7 @@ ifelse(<
 	.file "ecc-256-redc.asm"
 
 define(<RP>, <%rsi>)
-define(<U0>, <%rdi>) C Overlaps unused ecc input
+define(<U0>, <%rdi>) C Overlaps unused modulo input
 define(<U1>, <%rcx>)
 define(<U2>, <%rax>)
 define(<U3>, <%rdx>)