diff --git a/include/libssh/server.h b/include/libssh/server.h
index 6d1d706f..47a84a6c 100644
--- a/include/libssh/server.h
+++ b/include/libssh/server.h
@@ -159,7 +159,7 @@ LIBSSH_API int ssh_message_service_reply_success(ssh_message msg);
 LIBSSH_API char *ssh_message_service_service(ssh_message msg);
 
 LIBSSH_API void ssh_set_message_callback(ssh_session session,
-    int(*ssh_message_callback)(ssh_session session, ssh_message msg, void *data),
+    int(*ssh_bind_message_callback)(ssh_session session, ssh_message msg, void *data),
     void *data);
 LIBSSH_API int ssh_execute_message_callbacks(ssh_session session);
 
diff --git a/libssh/server.c b/libssh/server.c
index 1f9b7d9c..e2367675 100644
--- a/libssh/server.c
+++ b/libssh/server.c
@@ -1133,9 +1133,10 @@ char *ssh_message_channel_request_subsystem(ssh_message msg){
  * @param[in] data void pointer to be passed to callback functions
  */
 void ssh_set_message_callback(ssh_session session,
-    int(*ssh_message_callback_)(ssh_session session, ssh_message msg, void *data), void *data){
-  session->ssh_message_callback=ssh_message_callback_;
-  session->ssh_message_callback_data=data;
+        int(*ssh_bind_message_callback)(ssh_session session, ssh_message msg, void *data),
+        void *data) {
+  session->ssh_message_callback = ssh_bind_message_callback;
+  session->ssh_message_callback_data = data;
 }
 
 int ssh_execute_message_callbacks(ssh_session session){