diff --git a/tests/suites/test_suite_pkcs12.data b/tests/suites/test_suite_pkcs12.data
index 98f1c0d..c8bfe46 100644
--- a/tests/suites/test_suite_pkcs12.data
+++ b/tests/suites/test_suite_pkcs12.data
@@ -1,33 +1,33 @@
-Pkcs12 derive key : Zero length password and hash
+PKCS#12 derive key : Zero length password and hash
 depends_on:MBEDTLS_MD5_C
-pkcs12_derive_key_test:MBEDTLS_MD_MD5:48:"":1:"":1:3:0
+pkcs12_derive_key:MBEDTLS_MD_MD5:48:"":1:"":1:3:0
 
-Pkcs12 derive key: NULL password and hash
+PKCS#12 derive key: NULL password and hash
 depends_on:MBEDTLS_MD5_C
-pkcs12_derive_key_test:MBEDTLS_MD_MD5:48:"":0:"":0:3:0
+pkcs12_derive_key:MBEDTLS_MD_MD5:48:"":0:"":0:3:0
 
-Pkcs12 derive key: Zero length password
+PKCS#12 derive key: Zero length password
 depends_on:MBEDTLS_MD5_C
-pkcs12_derive_key_test:MBEDTLS_MD_MD5:48:"":1:"0123456789abcdef":1:3:0
+pkcs12_derive_key:MBEDTLS_MD_MD5:48:"":1:"0123456789abcdef":1:3:0
 
-Pkcs12 derive key: NULL password
+PKCS#12 derive key: NULL password
 depends_on:MBEDTLS_MD5_C
-pkcs12_derive_key_test:MBEDTLS_MD_MD5:48:"":0:"0123456789abcdef":1:3:0
+pkcs12_derive_key:MBEDTLS_MD_MD5:48:"":0:"0123456789abcdef":1:3:0
 
-Pkcs12 derive key: Invalid length NULL password
+PKCS#12 derive key: Invalid length NULL password
 depends_on:MBEDTLS_MD5_C
-pkcs12_derive_key_test:MBEDTLS_MD_MD5:48:"0123456789abcdef":2:"0123456789abcdef":1:3:MBEDTLS_ERR_PKCS12_BAD_INPUT_DATA
+pkcs12_derive_key:MBEDTLS_MD_MD5:48:"0123456789abcdef":2:"0123456789abcdef":1:3:MBEDTLS_ERR_PKCS12_BAD_INPUT_DATA
 
-Pkcs12 derive key: Zero length hash
+PKCS#12 derive key: Zero length hash
 depends_on:MBEDTLS_MD5_C
-pkcs12_derive_key_test:MBEDTLS_MD_MD5:48:"0123456789abcdef":1:"":1:3:0
+pkcs12_derive_key:MBEDTLS_MD_MD5:48:"0123456789abcdef":1:"":1:3:0
 
-Pkcs12 derive key: NULL hash
+PKCS#12 derive key: NULL hash
 depends_on:MBEDTLS_MD5_C
-pkcs12_derive_key_test:MBEDTLS_MD_MD5:48:"0123456789abcdef":1:"":0:3:0
+pkcs12_derive_key:MBEDTLS_MD_MD5:48:"0123456789abcdef":1:"":0:3:0
 
-Pkcs12 derive key: Invalid length NULL hash
+PKCS#12 derive key: Invalid length NULL hash
 depends_on:MBEDTLS_MD5_C
-pkcs12_derive_key_test:MBEDTLS_MD_MD5:48:"0123456789abcdef":1:"0123456789abcdef":2:3:MBEDTLS_ERR_PKCS12_BAD_INPUT_DATA
+pkcs12_derive_key:MBEDTLS_MD_MD5:48:"0123456789abcdef":1:"0123456789abcdef":2:3:MBEDTLS_ERR_PKCS12_BAD_INPUT_DATA
 
 
diff --git a/tests/suites/test_suite_pkcs12.function b/tests/suites/test_suite_pkcs12.function
index 6f49faf..3d402d7 100644
--- a/tests/suites/test_suite_pkcs12.function
+++ b/tests/suites/test_suite_pkcs12.function
@@ -16,10 +16,10 @@
  */
 
 /* BEGIN_CASE */
-void pkcs12_derive_key_test( int md_type, int key_size_arg,
-                             data_t *password_arg, int password_usage,
-                             data_t *salt_arg, int salt_usage,
-                             int iterations, int expected_status )
+void pkcs12_derive_key( int md_type, int key_size_arg,
+                        data_t *password_arg, int password_usage,
+                        data_t *salt_arg, int salt_usage,
+                        int iterations, int expected_status )
 
 {
    int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;