diff --git a/tests/suites/test_suite_debug.function b/tests/suites/test_suite_debug.function
index 6bc524b..f1a7f71 100644
--- a/tests/suites/test_suite_debug.function
+++ b/tests/suites/test_suite_debug.function
@@ -37,7 +37,7 @@
 
     ssl_set_dbg(&ssl, string_debug, &buffer);
 
-    TEST_ASSERT( x509parse_crtfile( &crt, crt_file ) == 0 );
+    TEST_ASSERT( x509_crt_parse_file( &crt, crt_file ) == 0 );
     debug_print_crt( &ssl, 0, file, line, prefix, &crt);
 
     TEST_ASSERT( strcmp( buffer.buf, result_str ) == 0 );
diff --git a/tests/suites/test_suite_x509parse.function b/tests/suites/test_suite_x509parse.function
index 082dd33..0aa2a62 100644
--- a/tests/suites/test_suite_x509parse.function
+++ b/tests/suites/test_suite_x509parse.function
@@ -10,7 +10,7 @@
     ((void) crt);
     ((void) certificate_depth);
     *flags |= BADCERT_OTHER;
-    
+
     return 0;
 }
 
@@ -41,8 +41,8 @@
     x509_crt_init( &crt );
     memset( buf, 0, 2000 );
 
-    TEST_ASSERT( x509parse_crtfile( &crt, crt_file ) == 0 );
-    res = x509parse_cert_info( buf, 2000, "", &crt );
+    TEST_ASSERT( x509_crt_parse_file( &crt, crt_file ) == 0 );
+    res = x509_crt_info( buf, 2000, "", &crt );
 
     x509_crt_free( &crt );
 
@@ -63,8 +63,8 @@
     x509_crl_init( &crl );
     memset( buf, 0, 2000 );
 
-    TEST_ASSERT( x509parse_crlfile( &crl, crl_file ) == 0 );
-    res = x509parse_crl_info( buf, 2000, "", &crl );
+    TEST_ASSERT( x509_crl_parse_file( &crl, crl_file ) == 0 );
+    res = x509_crl_info( buf, 2000, "", &crl );
 
     x509_crl_free( &crl );
 
@@ -104,11 +104,11 @@
     else
         TEST_ASSERT( "No known verify callback selected" == 0 );
 
-    TEST_ASSERT( x509parse_crtfile( &crt, crt_file ) == 0 );
-    TEST_ASSERT( x509parse_crtfile( &ca, ca_file ) == 0 );
-    TEST_ASSERT( x509parse_crlfile( &crl, crl_file ) == 0 );
+    TEST_ASSERT( x509_crt_parse_file( &crt, crt_file ) == 0 );
+    TEST_ASSERT( x509_crt_parse_file( &ca, ca_file ) == 0 );
+    TEST_ASSERT( x509_crl_parse_file( &crl, crl_file ) == 0 );
 
-    res = x509parse_verify( &crt, &ca, &crl, cn_name, &flags, f_vrfy, NULL );
+    res = x509_crt_verify( &crt, &ca, &crl, cn_name, &flags, f_vrfy, NULL );
 
     x509_crt_free( &crt );
     x509_crt_free( &ca );
@@ -129,7 +129,7 @@
     x509_crt_init( &crt );
     memset( buf, 0, 2000 );
 
-    TEST_ASSERT( x509parse_crtfile( &crt, crt_file ) == 0 );
+    TEST_ASSERT( x509_crt_parse_file( &crt, crt_file ) == 0 );
     if( strcmp( entity, "subject" ) == 0 )
         res =  x509_dn_gets( buf, 2000, &crt.subject );
     else if( strcmp( entity, "issuer" ) == 0 )
@@ -153,7 +153,7 @@
 
     x509_crt_init( &crt );
 
-    TEST_ASSERT( x509parse_crtfile( &crt, crt_file ) == 0 );
+    TEST_ASSERT( x509_crt_parse_file( &crt, crt_file ) == 0 );
 
     if( strcmp( entity, "valid_from" ) == 0 )
         TEST_ASSERT( x509_time_expired( &crt.valid_from ) == result );
@@ -180,10 +180,10 @@
 
     data_len = unhexify( buf, crt_data );
 
-    TEST_ASSERT( x509parse_crt( &crt, buf, data_len ) == ( result ) );
+    TEST_ASSERT( x509_crt_parse( &crt, buf, data_len ) == ( result ) );
     if( ( result ) == 0 )
     {
-        res = x509parse_cert_info( (char *) output, 2000, "", &crt );
+        res = x509_crt_info( (char *) output, 2000, "", &crt );
 
         TEST_ASSERT( res != -1 );
         TEST_ASSERT( res != -2 );
@@ -209,10 +209,10 @@
 
     data_len = unhexify( buf, crl_data );
 
-    TEST_ASSERT( x509parse_crl( &crl, buf, data_len ) == ( result ) );
+    TEST_ASSERT( x509_crl_parse( &crl, buf, data_len ) == ( result ) );
     if( ( result ) == 0 )
     {
-        res = x509parse_crl_info( (char *) output, 2000, "", &crl );
+        res = x509_crl_info( (char *) output, 2000, "", &crl );
 
         TEST_ASSERT( res != -1 );
         TEST_ASSERT( res != -2 );