diff --git a/modbus/modbus.c b/modbus/modbus.c
index f84bce8..a59bdbf 100644
--- a/modbus/modbus.c
+++ b/modbus/modbus.c
@@ -733,8 +733,8 @@ static int response_exception(modbus_param_t *mb_param, sft_t *sft,
    If an error occurs, this function construct the response
    accordingly.
 */
-void manage_query(modbus_param_t *mb_param, uint8_t *query,
-                  int query_length, modbus_mapping_t *mb_mapping)
+void modbus_manage_query(modbus_param_t *mb_param, uint8_t *query,
+                         int query_length, modbus_mapping_t *mb_mapping)
 {                   
         int offset = mb_param->header_length;
         int slave = query[offset];
diff --git a/modbus/modbus.h b/modbus/modbus.h
index 8a133f1..e7b0698 100644
--- a/modbus/modbus.h
+++ b/modbus/modbus.h
@@ -267,10 +267,11 @@ int modbus_mapping_new(modbus_mapping_t *mb_mapping,
 /* Frees the 4 arrays */
 void modbus_mapping_free(modbus_mapping_t *mb_mapping);
 
-/* Listens for any query from a modbus master in TCP */
+/* Initializes the modbus_param_t structure for a TCP slave (server) */
 int modbus_init_listen_tcp(modbus_param_t *mb_param);
 
-/* FIXME */
+/* Listens for any query from a modbus master in TCP 
+   Not tested in RTU communication. */
 int modbus_listen(modbus_param_t *mb_param, uint8_t *query, int *query_length);
 
 /* Manages the received query.
@@ -279,12 +280,9 @@ int modbus_listen(modbus_param_t *mb_param, uint8_t *query, int *query_length);
    If an error occurs, this function construct the response
    accordingly.
 */
-void manage_query(modbus_param_t *mb_param, uint8_t *query,
-                  int query_length, modbus_mapping_t *mb_mapping);
+void modbus_manage_query(modbus_param_t *mb_param, uint8_t *query,
+                         int query_length, modbus_mapping_t *mb_mapping);
 
-/* Not implemented :
-   - read_exception_status()
-*/
 
 /** 
  * UTILS FUNCTIONS
diff --git a/tests/bench-bandwidth-slave.c b/tests/bench-bandwidth-slave.c
index 9d30807..21697e3 100644
--- a/tests/bench-bandwidth-slave.c
+++ b/tests/bench-bandwidth-slave.c
@@ -45,7 +45,7 @@ int main(void)
                 
                 ret = modbus_listen(&mb_param, query, &query_size);
                 if (ret == 0) {
-                        manage_query(&mb_param, query, query_size, &mb_mapping);
+                        modbus_manage_query(&mb_param, query, query_size, &mb_mapping);
                 } else if (ret == CONNECTION_CLOSED) {
                         /* Connection closed by the client, end of server */
                         break;
diff --git a/tests/random-test-slave.c b/tests/random-test-slave.c
index 98926e8..c51674b 100644
--- a/tests/random-test-slave.c
+++ b/tests/random-test-slave.c
@@ -45,7 +45,7 @@ int main(void)
                 
                 ret = modbus_listen(&mb_param, query, &query_size);
                 if (ret == 0) {
-                        manage_query(&mb_param, query, query_size, &mb_mapping);
+                        modbus_manage_query(&mb_param, query, query_size, &mb_mapping);
                 } else if (ret == CONNECTION_CLOSED) {
                         /* Connection closed by the client, end of server */
                         break;
diff --git a/tests/unit-test-slave.c b/tests/unit-test-slave.c
index 99fe622..753bcc0 100644
--- a/tests/unit-test-slave.c
+++ b/tests/unit-test-slave.c
@@ -67,7 +67,7 @@ int main(void)
                 
                 ret = modbus_listen(&mb_param, query, &query_size);
                 if (ret == 0) {
-                        manage_query(&mb_param, query, query_size, &mb_mapping);
+                        modbus_manage_query(&mb_param, query, query_size, &mb_mapping);
                 } else if (ret == CONNECTION_CLOSED) {
                         /* Connection closed by the client, end of server */
                         break;