diff --git a/library/ecp_curves.c b/library/ecp_curves.c
index 269f5fcf90..2da4bdd92c 100644
--- a/library/ecp_curves.c
+++ b/library/ecp_curves.c
@@ -4585,7 +4585,7 @@ static int ecp_mod_p384(mbedtls_mpi *);
 #if defined(MBEDTLS_ECP_DP_SECP521R1_ENABLED)
 static int ecp_mod_p521(mbedtls_mpi *);
 MBEDTLS_STATIC_TESTABLE
-int ecp_mod_p521_raw(mbedtls_mpi_uint *N_p, size_t N_n);
+int mbedtls_ecp_mod_p521_raw(mbedtls_mpi_uint *N_p, size_t N_n);
 #endif
 
 #define NIST_MODP(P)      grp->modp = ecp_mod_ ## P;
@@ -5205,13 +5205,13 @@ static int ecp_mod_p521(mbedtls_mpi *N)
     int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
     size_t expected_width = 2 * ((521 + biL - 1) / biL);
     MBEDTLS_MPI_CHK(mbedtls_mpi_grow(N, expected_width));
-    ret = ecp_mod_p521_raw(N->p, expected_width);
+    ret = mbedtls_ecp_mod_p521_raw(N->p, expected_width);
 cleanup:
     return ret;
 }
 
 MBEDTLS_STATIC_TESTABLE
-int ecp_mod_p521_raw(mbedtls_mpi_uint *N_p, size_t N_n)
+int mbedtls_ecp_mod_p521_raw(mbedtls_mpi_uint *N_p, size_t N_n)
 {
     mbedtls_mpi_uint carry = 0;
 
diff --git a/library/ecp_invasive.h b/library/ecp_invasive.h
index 2854fb0a96..45b0006963 100644
--- a/library/ecp_invasive.h
+++ b/library/ecp_invasive.h
@@ -104,7 +104,7 @@ int mbedtls_ecp_mod_p192_raw(mbedtls_mpi_uint *Np, size_t Nn);
  * \param[in]       N_n     The length of \p N_p in limbs.
  */
 MBEDTLS_STATIC_TESTABLE
-int ecp_mod_p521_raw(mbedtls_mpi_uint *N_p, size_t N_n);
+int mbedtls_ecp_mod_p521_raw(mbedtls_mpi_uint *N_p, size_t N_n);
 
 #endif /* MBEDTLS_ECP_DP_SECP521R1_ENABLED */
 
diff --git a/tests/suites/test_suite_ecp.function b/tests/suites/test_suite_ecp.function
index b1a096d046..a0042ed348 100644
--- a/tests/suites/test_suite_ecp.function
+++ b/tests/suites/test_suite_ecp.function
@@ -1374,7 +1374,7 @@ void ecp_mod_p521_raw(char *input_N,
                    &m, N, limbs,
                    MBEDTLS_MPI_MOD_REP_MONTGOMERY), 0);
 
-    TEST_EQUAL(ecp_mod_p521_raw(X, limbs_X), 0);
+    TEST_EQUAL(mbedtls_ecp_mod_p521_raw(X, limbs_X), 0);
     mbedtls_mpi_mod_raw_fix_quasi_reduction(X, &m);
     ASSERT_COMPARE(X, bytes, res, bytes);