diff --git a/library/x509_csr.c b/library/x509_csr.c
index 65bc63c..91ddb1f 100644
--- a/library/x509_csr.c
+++ b/library/x509_csr.c
@@ -87,7 +87,7 @@
 /*
  * Parse a CSR
  */
-int x509parse_csr( x509_csr *csr, const unsigned char *buf, size_t buflen )
+int x509_csr_parse( x509_csr *csr, const unsigned char *buf, size_t buflen )
 {
     int ret;
     size_t len;
@@ -287,7 +287,7 @@
 /*
  * Load a CSR into the structure
  */
-int x509parse_csrfile( x509_csr *csr, const char *path )
+int x509_csr_parse_file( x509_csr *csr, const char *path )
 {
     int ret;
     size_t n;
@@ -296,7 +296,7 @@
     if ( ( ret = x509_load_file( path, &buf, &n ) ) != 0 )
         return( ret );
 
-    ret = x509parse_csr( csr, buf, n );
+    ret = x509_csr_parse( csr, buf, n );
 
     memset( buf, 0, n + 1 );
     polarssl_free( buf );
@@ -361,8 +361,8 @@
 /*
  * Return an informational string about the CSR.
  */
-int x509parse_csr_info( char *buf, size_t size, const char *prefix,
-                        const x509_csr *csr )
+int x509_csr_info( char *buf, size_t size, const char *prefix,
+                   const x509_csr *csr )
 {
     int ret;
     size_t n;