diff --git a/include/mbedtls/pkcs11_client.h b/include/mbedtls/pkcs11_client.h
index ff555b7..97b4291 100644
--- a/include/mbedtls/pkcs11_client.h
+++ b/include/mbedtls/pkcs11_client.h
@@ -75,7 +75,7 @@
  *                      exception, it's ok to call mbedtls_pk_free() itself
  *                      even if the Cryptoki handles have become invalid.
  */
-int mbedtls_pk_setup_pkcs11( mbedtls_pk_context *ctx,
+int mbedtls_pkcs11_setup_pk( mbedtls_pk_context *ctx,
                              CK_SESSION_HANDLE hSession,
                              CK_OBJECT_HANDLE hPublicKey,
                              CK_OBJECT_HANDLE hPrivateKey );
@@ -140,7 +140,7 @@
  *                      also failed, for example because the token was
  *                      disconnected.
  */
-int mbedtls_pk_import_to_pkcs11( const mbedtls_pk_context *ctx,
+int mbedtls_pkcs11_import_pk( const mbedtls_pk_context *ctx,
                                  uint32_t flags,
                                  CK_SESSION_HANDLE hSession,
                                  CK_OBJECT_HANDLE *hPublicKey,
diff --git a/library/pkcs11_client.c b/library/pkcs11_client.c
index 1e662f8..e1b7e6d 100644
--- a/library/pkcs11_client.c
+++ b/library/pkcs11_client.c
@@ -327,7 +327,7 @@
                               , NULL //debug_func
         );
 
-int mbedtls_pk_setup_pkcs11( mbedtls_pk_context *ctx,
+int mbedtls_pkcs11_setup_pk( mbedtls_pk_context *ctx,
                              CK_SESSION_HANDLE hSession,
                              CK_OBJECT_HANDLE hPublicKey,
                              CK_OBJECT_HANDLE hPrivateKey )
@@ -438,7 +438,7 @@
 
 #define MBEDTLS_PKCS11_BOOL( x ) ( ( x ) ? CK_TRUE : CK_FALSE )
 
-int mbedtls_pk_import_to_pkcs11( const mbedtls_pk_context *ctx,
+int mbedtls_pkcs11_import_pk( const mbedtls_pk_context *ctx,
                                  uint32_t flags,
                                  CK_SESSION_HANDLE hSession,
                                  CK_OBJECT_HANDLE *hPublicKey,
diff --git a/tests/suites/test_suite_pkcs11_client.function b/tests/suites/test_suite_pkcs11_client.function
index 16ad240..145493e 100644
--- a/tests/suites/test_suite_pkcs11_client.function
+++ b/tests/suites/test_suite_pkcs11_client.function
@@ -189,7 +189,7 @@
     /* Prepare the mbed TLS contexts */
     TEST_ASSERT( mbedtls_pk_setup( &transparent_ctx,
                                    mbedtls_pk_info_from_type( key_type ) ) == 0 );
-    TEST_ASSERT( mbedtls_pk_setup_pkcs11( &pkcs11_ctx,
+    TEST_ASSERT( mbedtls_pkcs11_setup_pk( &pkcs11_ctx,
                                           hSession,
                                           hPublicKey,
                                           hPrivateKey ) == 0 );
@@ -288,20 +288,20 @@
     hSession = pkcs11_init( );
     TEST_ASSERT( hSession != CK_INVALID_HANDLE );
 
-    TEST_ASSERT( mbedtls_pk_import_to_pkcs11( &transparent_ctx,
-                                              MBEDTLS_PK_FLAG_SIGN |
-                                              MBEDTLS_PK_FLAG_VERIFY,
+    TEST_ASSERT( mbedtls_pkcs11_import_pk ( &transparent_ctx,
+                                              MBEDTLS_PKCS11_FLAG_SIGN |
+                                              MBEDTLS_PKCS11_FLAG_VERIFY,
                                               hSession,
                                               &hPublicKey,
                                               &hPrivateKey ) == 0 );
     TEST_ASSERT( hPublicKey != CK_INVALID_HANDLE );
     TEST_ASSERT( hPrivateKey != CK_INVALID_HANDLE );
-    TEST_ASSERT( mbedtls_pk_setup_pkcs11( &pkcs11_ctx,
+    TEST_ASSERT( mbedtls_pkcs11_setup_pk( &pkcs11_ctx,
                                           hSession,
                                           hPublicKey,
                                           hPrivateKey ) == 0 );
 
-    /* Sign with the token and verify in software */
+    /* Sign with cryptoki and verify with mbedTLS */
     TEST_ASSERT( sizeof( sig_buffer ) >= mbedtls_pk_signature_size( &pkcs11_ctx ) );
     TEST_ASSERT( mbedtls_pk_sign( &pkcs11_ctx, MBEDTLS_MD_SHA256,
                                   hash_value, 32,
@@ -348,20 +348,20 @@
     hSession = pkcs11_init( );
     TEST_ASSERT( hSession != CK_INVALID_HANDLE );
 
-    TEST_ASSERT( mbedtls_pk_import_to_pkcs11( &transparent_ctx,
-                                              MBEDTLS_PK_FLAG_SIGN |
-                                              MBEDTLS_PK_FLAG_VERIFY,
+    TEST_ASSERT( mbedtls_pkcs11_import_pk ( &transparent_ctx,
+                                              MBEDTLS_PKCS11_FLAG_SIGN |
+                                              MBEDTLS_PKCS11_FLAG_VERIFY,
                                               hSession,
                                               &hPublicKey,
                                               &hPrivateKey ) == 0 );
     TEST_ASSERT( hPublicKey != CK_INVALID_HANDLE );
     TEST_ASSERT( hPrivateKey != CK_INVALID_HANDLE );
-    TEST_ASSERT( mbedtls_pk_setup_pkcs11( &pkcs11_ctx,
+    TEST_ASSERT( mbedtls_pkcs11_setup_pk( &pkcs11_ctx,
                                           hSession,
                                           hPublicKey,
                                           hPrivateKey ) == 0 );
 
-    /* Sign with the token and verify with cryptoki */
+    /* Sign with cryptoki and verify with cryptoki */
     TEST_ASSERT( sizeof( sig_buffer ) >= mbedtls_pk_signature_size( &pkcs11_ctx ) );
     TEST_ASSERT( mbedtls_pk_sign( &pkcs11_ctx, MBEDTLS_MD_SHA256,
                                   hash_value, 32,
@@ -407,19 +407,19 @@
     hSession = pkcs11_init( );
     TEST_ASSERT( hSession != CK_INVALID_HANDLE );
 
-    TEST_ASSERT( mbedtls_pk_import_to_pkcs11( &transparent_ctx,
-                                              MBEDTLS_PK_FLAG_SIGN |
-                                              MBEDTLS_PK_FLAG_VERIFY,
+    TEST_ASSERT( mbedtls_pkcs11_import_pk ( &transparent_ctx,
+                                              MBEDTLS_PKCS11_FLAG_SIGN |
+                                              MBEDTLS_PKCS11_FLAG_VERIFY,
                                               hSession,
                                               &hPublicKey,
                                               NULL ) == 0 );
     TEST_ASSERT( hPublicKey != CK_INVALID_HANDLE );
-    TEST_ASSERT( mbedtls_pk_setup_pkcs11( &pkcs11_ctx,
+    TEST_ASSERT( mbedtls_pkcs11_setup_pk( &pkcs11_ctx,
                                           hSession,
                                           hPublicKey,
                                           CK_INVALID_HANDLE ) == 0 );
 
-    /* Sign with the token and verify with cryptoki */
+    /* Sign with mbed TLS and verify with cryptoki */
     TEST_ASSERT( sizeof( sig_buffer ) >= mbedtls_pk_signature_size( &pkcs11_ctx ) );
     TEST_ASSERT( mbedtls_pk_sign( &transparent_ctx, MBEDTLS_MD_SHA256,
                                   hash_value, 32,
@@ -476,14 +476,14 @@
     /* Initialize cryptoki and import the key into the token */
     hSession = pkcs11_init( );
     TEST_ASSERT( hSession != CK_INVALID_HANDLE );
-    TEST_ASSERT( mbedtls_pk_import_to_pkcs11( &transparent_ctx,
-                                              MBEDTLS_PK_FLAG_SIGN |
-                                              MBEDTLS_PK_FLAG_VERIFY,
+    TEST_ASSERT( mbedtls_pkcs11_import_pk ( &transparent_ctx,
+                                              MBEDTLS_PKCS11_FLAG_SIGN |
+                                              MBEDTLS_PKCS11_FLAG_VERIFY,
                                               hSession,
                                               &hPublicKey,
                                               NULL ) == 0 );
     TEST_ASSERT( hPublicKey != CK_INVALID_HANDLE );
-    TEST_ASSERT( mbedtls_pk_setup_pkcs11( &pkcs11_ctx,
+    TEST_ASSERT( mbedtls_pkcs11_setup_pk( &pkcs11_ctx,
                                           hSession,
                                           hPublicKey,
                                           CK_INVALID_HANDLE ) == 0 );