diff --git a/library/x509_crt.c b/library/x509_crt.c
index 609463a..f57fddc 100644
--- a/library/x509_crt.c
+++ b/library/x509_crt.c
@@ -1100,17 +1100,17 @@
                                prefix );
     SAFE_SNPRINTF();
 
-    ret = x509parse_serial_gets( p, n, &crt->serial);
+    ret = x509_serial_gets( p, n, &crt->serial);
     SAFE_SNPRINTF();
 
     ret = snprintf( p, n, "\n%sissuer name   : ", prefix );
     SAFE_SNPRINTF();
-    ret = x509parse_dn_gets( p, n, &crt->issuer  );
+    ret = x509_dn_gets( p, n, &crt->issuer  );
     SAFE_SNPRINTF();
 
     ret = snprintf( p, n, "\n%ssubject name  : ", prefix );
     SAFE_SNPRINTF();
-    ret = x509parse_dn_gets( p, n, &crt->subject );
+    ret = x509_dn_gets( p, n, &crt->subject );
     SAFE_SNPRINTF();
 
     ret = snprintf( p, n, "\n%sissued  on    : " \
@@ -1163,7 +1163,7 @@
         if( crt->serial.len == cur->serial.len &&
             memcmp( crt->serial.p, cur->serial.p, crt->serial.len ) == 0 )
         {
-            if( x509parse_time_expired( &cur->revocation_date ) )
+            if( x509_time_expired( &cur->revocation_date ) )
                 return( 1 );
         }
 
@@ -1229,7 +1229,7 @@
         /*
          * Check for validity of CRL (Do not drop out)
          */
-        if( x509parse_time_expired( &crl_list->next_update ) )
+        if( x509_time_expired( &crl_list->next_update ) )
             flags |= BADCRL_EXPIRED;
 
         /*
@@ -1310,7 +1310,7 @@
     unsigned char hash[POLARSSL_MD_MAX_SIZE];
     const md_info_t *md_info;
 
-    if( x509parse_time_expired( &child->valid_to ) )
+    if( x509_time_expired( &child->valid_to ) )
         *flags |= BADCERT_EXPIRED;
 
     /*
@@ -1388,7 +1388,7 @@
         *flags |= x509parse_verifycrl( child, trust_ca, ca_crl );
 #endif
 
-        if( x509parse_time_expired( &trust_ca->valid_to ) )
+        if( x509_time_expired( &trust_ca->valid_to ) )
             ca_flags |= BADCERT_EXPIRED;
 
         if( NULL != f_vrfy )
@@ -1422,7 +1422,7 @@
     x509_cert *grandparent;
     const md_info_t *md_info;
 
-    if( x509parse_time_expired( &child->valid_to ) )
+    if( x509_time_expired( &child->valid_to ) )
         *flags |= BADCERT_EXPIRED;
 
     md_info = md_info_from_type( child->sig_md );