diff --git a/library/ecp_curves.c b/library/ecp_curves.c
index 04abdd38d..a4cd228ca 100644
--- a/library/ecp_curves.c
+++ b/library/ecp_curves.c
@@ -4581,7 +4581,7 @@ int mbedtls_ecp_mod_p224_raw(mbedtls_mpi_uint *X, size_t X_limbs);
 #if defined(MBEDTLS_ECP_DP_SECP256R1_ENABLED)
 static int ecp_mod_p256(mbedtls_mpi *);
 MBEDTLS_STATIC_TESTABLE
-int ecp_mod_p256_raw(mbedtls_mpi_uint *Np, size_t Nn);
+int mbedtls_ecp_mod_p256_raw(mbedtls_mpi_uint *X, size_t X_limbs);
 #endif
 #if defined(MBEDTLS_ECP_DP_SECP384R1_ENABLED)
 static int ecp_mod_p384(mbedtls_mpi *);
@@ -5110,15 +5110,15 @@ static int ecp_mod_p256(mbedtls_mpi *N)
     int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
     size_t expected_width = 2 * ((256 + biL - 1) / biL);
     MBEDTLS_MPI_CHK(mbedtls_mpi_grow(N, expected_width));
-    ret = ecp_mod_p256_raw(N->p, expected_width);
+    ret = mbedtls_ecp_mod_p256_raw(N->p, expected_width);
 cleanup:
     return ret;
 }
 
 MBEDTLS_STATIC_TESTABLE
-int ecp_mod_p256_raw(mbedtls_mpi_uint *Np, size_t Nn)
+int mbedtls_ecp_mod_p256_raw(mbedtls_mpi_uint *X, size_t X_limbs)
 {
-    if (Nn != 2*((256 + biL - 1)/biL)) {
+    if (X_limbs != 2*((256 + biL - 1)/biL)) {
         return MBEDTLS_ERR_ECP_BAD_INPUT_DATA;
     }
 
diff --git a/library/ecp_invasive.h b/library/ecp_invasive.h
index 8e321abde..7adbe7e9b 100644
--- a/library/ecp_invasive.h
+++ b/library/ecp_invasive.h
@@ -119,7 +119,7 @@ int mbedtls_ecp_mod_p224_raw(mbedtls_mpi_uint *X, size_t X_limbs);
 #if defined(MBEDTLS_ECP_DP_SECP256R1_ENABLED)
 
 MBEDTLS_STATIC_TESTABLE
-int ecp_mod_p256_raw(mbedtls_mpi_uint *Np, size_t Nn);
+int mbedtls_ecp_mod_p256_raw(mbedtls_mpi_uint *X, size_t X_limbs);
 
 #endif