diff --git a/include/libssh/libssh.h b/include/libssh/libssh.h
index f265fa0b..fc6a4230 100644
--- a/include/libssh/libssh.h
+++ b/include/libssh/libssh.h
@@ -252,7 +252,7 @@ PRIVATE_KEY *privatekey_from_file(SSH_SESSION *session, const char *filename,
     int type, const char *passphrase);
 STRING *publickey_to_string(PUBLIC_KEY *key);
 PUBLIC_KEY *publickey_from_privatekey(PRIVATE_KEY *prv);
-void private_key_free(PRIVATE_KEY *prv);
+void privatekey_free(PRIVATE_KEY *prv);
 STRING *publickey_from_file(SSH_SESSION *session, const char *filename,int *_type);
 STRING *publickey_from_next_file(SSH_SESSION *session, const char **pub_keys_path,
     const char **keys_path, char **privkeyfile, int *type, int *count);
diff --git a/libssh/auth.c b/libssh/auth.c
index 105272c2..99c2d05e 100644
--- a/libssh/auth.c
+++ b/libssh/auth.c
@@ -360,7 +360,7 @@ error:
  * SSH_AUTH_SUCCESS : Authentication success
  * \see publickey_from_file()
  * \see privatekey_from_file()
- * \see private_key_free()
+ * \see privatekey_free()
  * \see ssh_userauth_offer_pubkey()
  */
 
@@ -471,7 +471,7 @@ error:
  * SSH_AUTH_SUCCESS : Authentication success
  * \see publickey_from_file()
  * \see privatekey_from_file()
- * \see private_key_free()
+ * \see privatekey_free()
  * \see ssh_userauth_offer_pubkey()
  */
 
@@ -865,7 +865,7 @@ int ssh_userauth_autopubkey(SSH_SESSION *session, const char *passphrase) {
             }
             free(pubkey);
             free(privkeyfile);
-            private_key_free(privkey);
+            privatekey_free(privkey);
             leave_function();
             return err;
         } else
@@ -877,14 +877,14 @@ int ssh_userauth_autopubkey(SSH_SESSION *session, const char *passphrase) {
             pubkey=NULL;
             free(privkeyfile);
             privkeyfile=NULL;
-            private_key_free(privkey);
+            privatekey_free(privkey);
             continue;
         }
         /* auth success */
         ssh_log(session, SSH_LOG_RARE,
             "Authentication using %s success\n", privkeyfile);
         free(pubkey);
-        private_key_free(privkey);
+        privatekey_free(privkey);
         free(privkeyfile);
         if(id){
             pub_keys_path[0]=NULL;
diff --git a/libssh/keyfiles.c b/libssh/keyfiles.c
index 51b99e8e..bb0af82a 100644
--- a/libssh/keyfiles.c
+++ b/libssh/keyfiles.c
@@ -603,7 +603,7 @@ static int pem_get_password(char *buf, int size, int rwflag, void *userdata) {
  * \param type Type of the private key. One of TYPE_DSS or TYPE_RSA.
  * \param passphrase Passphrase to decrypt the private key. Set to null if none is needed or it is unknown.
  * \returns a PRIVATE_KEY object containing the private key, or NULL if it failed.
- * \see private_key_free()
+ * \see privatekey_free()
  * \see publickey_from_privatekey()
  */
 PRIVATE_KEY  *privatekey_from_file(SSH_SESSION *session, const char *filename,
@@ -779,7 +779,7 @@ PRIVATE_KEY *_privatekey_from_file(void *session, const char *filename,
 /** \brief deallocate a private key
  * \param prv a PRIVATE_KEY object
  */
-void private_key_free(PRIVATE_KEY *prv) {
+void privatekey_free(PRIVATE_KEY *prv) {
   if (prv == NULL) {
     return;
   }
diff --git a/libssh/server.c b/libssh/server.c
index b1f5e3bf..fd13274f 100644
--- a/libssh/server.c
+++ b/libssh/server.c
@@ -159,7 +159,7 @@ SSH_SESSION *ssh_bind_accept(SSH_BIND *ssh_bind){
         rsa=_privatekey_from_file(ssh_bind,ssh_bind->options->rsakey,TYPE_RSA);
         if(!rsa){
             if(dsa)
-                private_key_free(dsa);
+                privatekey_free(dsa);
             return NULL;
         }
     }
@@ -168,9 +168,9 @@ SSH_SESSION *ssh_bind_accept(SSH_BIND *ssh_bind){
         ssh_set_error(ssh_bind,SSH_FATAL,"Accepting a new connection: %s",
                 strerror(errno));
         if(dsa)
-            private_key_free(dsa);
+            privatekey_free(dsa);
         if(rsa)
-            private_key_free(rsa);
+            privatekey_free(rsa);
         return NULL;
     }
     session=ssh_new();
@@ -180,9 +180,9 @@ SSH_SESSION *ssh_bind_accept(SSH_BIND *ssh_bind){
     if (session->options == NULL) {
       ssh_set_error(ssh_bind, SSH_FATAL, "No space left");
       if (dsa)
-        private_key_free(dsa);
+        privatekey_free(dsa);
       if (rsa)
-        private_key_free(rsa);
+        privatekey_free(rsa);
       ssh_cleanup(session);
       return NULL;
     }
@@ -191,9 +191,9 @@ SSH_SESSION *ssh_bind_accept(SSH_BIND *ssh_bind){
     session->socket=ssh_socket_new(session);
     if (session->socket == NULL) {
       if (dsa)
-        private_key_free(dsa);
+        privatekey_free(dsa);
       if (rsa)
-        private_key_free(rsa);
+        privatekey_free(rsa);
       ssh_cleanup(session);
       return NULL;
     }
@@ -310,11 +310,11 @@ static int dh_handshake_server(SSH_SESSION *session){
     buffer_free(buf);
     /* free private keys as they should not be readable past this point */
     if(session->rsa_key){
-        private_key_free(session->rsa_key);
+        privatekey_free(session->rsa_key);
         session->rsa_key=NULL;
     }
     if(session->dsa_key){
-        private_key_free(session->dsa_key);
+        privatekey_free(session->dsa_key);
         session->dsa_key=NULL;
     }
     buffer_add_u8(session->out_buffer,SSH2_MSG_KEXDH_REPLY);
diff --git a/libssh/session.c b/libssh/session.c
index 894506f2..64c7fba6 100644
--- a/libssh/session.c
+++ b/libssh/session.c
@@ -125,8 +125,8 @@ void ssh_cleanup(SSH_SESSION *session) {
   SAFE_FREE(session->client_kex.methods);
   SAFE_FREE(session->server_kex.methods);
 
-  private_key_free(session->dsa_key);
-  private_key_free(session->rsa_key);
+  privatekey_free(session->dsa_key);
+  privatekey_free(session->rsa_key);
   ssh_message_free(session->ssh_message);
   ssh_options_free(session->options);