diff --git a/include/polarssl/pk.h b/include/polarssl/pk.h
index 7d141d9..c14c149 100644
--- a/include/polarssl/pk.h
+++ b/include/polarssl/pk.h
@@ -517,8 +517,8 @@
  *
  * \return          0 if successful, or a specific PK error code
  */
-int pk_parse_get_pubkey( unsigned char **p, const unsigned char *end,
-                         pk_context *pk );
+int pk_parse_subpubkey( unsigned char **p, const unsigned char *end,
+                        pk_context *pk );
 #endif /* POLARSSL_PK_PARSE_C */
 
 #if defined(POLARSSL_PK_WRITE_C)
diff --git a/library/pkparse.c b/library/pkparse.c
index 5a58abe..f123b6c 100644
--- a/library/pkparse.c
+++ b/library/pkparse.c
@@ -302,8 +302,8 @@
  *       algorithm            AlgorithmIdentifier,
  *       subjectPublicKey     BIT STRING }
  */
-int pk_parse_get_pubkey( unsigned char **p, const unsigned char *end,
-                         pk_context *pk )
+int pk_parse_subpubkey( unsigned char **p, const unsigned char *end,
+                        pk_context *pk )
 {
     int ret;
     size_t len;
@@ -945,7 +945,7 @@
 #endif
     p = (unsigned char *) key;
 
-    ret = pk_parse_get_pubkey( &p, p + keylen, ctx );
+    ret = pk_parse_subpubkey( &p, p + keylen, ctx );
 
 #if defined(POLARSSL_PEM_PARSE_C)
     pem_free( &pem );
diff --git a/library/x509_crt.c b/library/x509_crt.c
index 3c88b5e..8a3f13f 100644
--- a/library/x509_crt.c
+++ b/library/x509_crt.c
@@ -663,7 +663,7 @@
     /*
      * SubjectPublicKeyInfo
      */
-    if( ( ret = pk_parse_get_pubkey( &p, end, &crt->pk ) ) != 0 )
+    if( ( ret = pk_parse_subpubkey( &p, end, &crt->pk ) ) != 0 )
     {
         x509_crt_free( crt );
         return( ret );
diff --git a/library/x509_csr.c b/library/x509_csr.c
index e4b0517..aeddeb5 100644
--- a/library/x509_csr.c
+++ b/library/x509_csr.c
@@ -229,7 +229,7 @@
     /*
      *  subjectPKInfo SubjectPublicKeyInfo
      */
-    if( ( ret = pk_parse_get_pubkey( &p, end, &csr->pk ) ) != 0 )
+    if( ( ret = pk_parse_subpubkey( &p, end, &csr->pk ) ) != 0 )
     {
         x509_csr_free( csr );
         return( ret );