diff --git a/include/mbedtls/ecp_internal.h b/include/mbedtls/ecp_internal.h
index 46e595a..eda07ba 100644
--- a/include/mbedtls/ecp_internal.h
+++ b/include/mbedtls/ecp_internal.h
@@ -26,56 +26,54 @@
 
 #if defined(MBEDTLS_ECP_FUNCTION_ALT)
 
-unsigned char mbedtls_ecp_alt_grp_capable( const mbedtls_ecp_group *grp );
+unsigned char mbedtls_int_ecp_grp_capable( const mbedtls_ecp_group *grp );
 
-#if defined(MBEDTLS_ECP_INIT_ALT)
-int  mbedtls_ecp_alt_init( const mbedtls_ecp_group *grp );
-#endif
+int mbedtls_int_ecp_init( const mbedtls_ecp_group *grp );
 
-#if defined(MBEDTLS_ECP_DEINIT_ALT)
-void mbedtls_ecp_alt_deinit( const mbedtls_ecp_group *grp );
-#endif
+void mbedtls_int_ecp_deinit( const mbedtls_ecp_group *grp );
 
 #if defined(MBEDTLS_ECP_RANDOMIZE_JAC_ALT)
-int mbedtls_ecp_randomize_jac_alt( const mbedtls_ecp_group *grp, mbedtls_ecp_point *pt,
-                           int (*f_rng)(void *, unsigned char *, size_t),
-                           void *p_rng );
+int mbedtls_int_ecp_randomize_jac( const mbedtls_ecp_group *grp,
+        mbedtls_ecp_point *pt, int (*f_rng)(void *, unsigned char *, size_t),
+        void *p_rng );
 #endif
 
 #if defined(MBEDTLS_ECP_ADD_MIXED_ALT)
-int mbedtls_ecp_add_mixed_alt( const mbedtls_ecp_group *grp, mbedtls_ecp_point *R,
-                       const mbedtls_ecp_point *P, const mbedtls_ecp_point *Q );
+int mbedtls_int_ecp_add_mixed( const mbedtls_ecp_group *grp,
+        mbedtls_ecp_point *R, const mbedtls_ecp_point *P,
+        const mbedtls_ecp_point *Q );
 #endif
 
 #if defined(MBEDTLS_ECP_DOUBLE_JAC_ALT)
-int mbedtls_ecp_double_jac_alt( const mbedtls_ecp_group *grp, mbedtls_ecp_point *R,
-                        const mbedtls_ecp_point *P );
+int mbedtls_int_ecp_double_jac( const mbedtls_ecp_group *grp,
+        mbedtls_ecp_point *R, const mbedtls_ecp_point *P );
 #endif
 
 #if defined(MBEDTLS_ECP_NORMALIZE_JAC_MANY_ALT)
-int mbedtls_ecp_normalize_jac_many_alt( const mbedtls_ecp_group *grp,
-                                mbedtls_ecp_point *T[], size_t t_len );
+int mbedtls_int_ecp_normalize_jac_many( const mbedtls_ecp_group *grp,
+        mbedtls_ecp_point *T[], size_t t_len );
 #endif
 
 #if defined(MBEDTLS_ECP_NORMALIZE_JAC_ALT)
-int mbedtls_ecp_normalize_jac_alt( const mbedtls_ecp_group *grp, mbedtls_ecp_point *pt );
+int mbedtls_int_ecp_normalize_jac( const mbedtls_ecp_group *grp,
+        mbedtls_ecp_point *pt );
 #endif
 
 #if defined(MBEDTLS_ECP_DOUBLE_ADD_MXZ_ALT)
-int mbedtls_ecp_double_add_mxz_alt( const mbedtls_ecp_group *grp,
-                            mbedtls_ecp_point *R, mbedtls_ecp_point *S,
-                            const mbedtls_ecp_point *P,
-                            const mbedtls_ecp_point *Q, const mbedtls_mpi *d );
+int mbedtls_int_ecp_double_add_mxz( const mbedtls_ecp_group *grp,
+        mbedtls_ecp_point *R, mbedtls_ecp_point *S, const mbedtls_ecp_point *P,
+        const mbedtls_ecp_point *Q, const mbedtls_mpi *d );
 #endif
 
 #if defined(MBEDTLS_ECP_RANDOMIZE_MXZ_ALT)
-int mbedtls_ecp_randomize_mxz_alt( const mbedtls_ecp_group *grp, mbedtls_ecp_point *P,
-                           int (*f_rng)(void *, unsigned char *, size_t), 
-                           void *p_rng );
+int mbedtls_int_ecp_randomize_mxz( const mbedtls_ecp_group *grp,
+        mbedtls_ecp_point *P, int (*f_rng)(void *, unsigned char *, size_t),
+        void *p_rng );
 #endif
 
 #if defined(MBEDTLS_ECP_NORMALIZE_MXZ_ALT)
-int mbedtls_ecp_normalize_mxz_alt( const mbedtls_ecp_group *grp, mbedtls_ecp_point *P );
+int mbedtls_int_ecp_normalize_mxz( const mbedtls_ecp_group *grp,
+        mbedtls_ecp_point *P );
 #endif
 
 #endif /* MBEDTLS_ECP_FUNCTION_ALT */