diff --git a/src/modbus.c b/src/modbus.c
index 71ca5be..d12e3df 100644
--- a/src/modbus.c
+++ b/src/modbus.c
@@ -1487,9 +1487,9 @@ int modbus_write_registers(modbus_t *ctx, int addr, int nb, const uint16_t *data
 
 /* Read multiple registers from remote device to dest array and write multiple
    registers to remote device from data array. */
-int modbus_read_and_write_holding_registers(modbus_t *ctx,
-                                            int read_addr, int read_nb, uint16_t *dest,
-                                            int write_addr, int write_nb, const uint16_t *data)
+int modbus_read_and_write_registers(modbus_t *ctx,
+                                    int read_addr, int read_nb, uint16_t *dest,
+                                    int write_addr, int write_nb, const uint16_t *data)
 {
     int rc;
     int req_length;
@@ -1501,7 +1501,7 @@ int modbus_read_and_write_holding_registers(modbus_t *ctx,
     if (read_nb > MODBUS_MAX_READ_REGISTERS) {
         if (ctx->debug) {
             fprintf(stderr,
-                    "ERROR Too many holding registers requested (%d > %d)\n",
+                    "ERROR Too many registers requested (%d > %d)\n",
                     read_nb, MODBUS_MAX_READ_REGISTERS);
         }
         errno = EMBMDATA;
@@ -1511,7 +1511,7 @@ int modbus_read_and_write_holding_registers(modbus_t *ctx,
     if (write_nb > MODBUS_MAX_RW_WRITE_REGISTERS) {
         if (ctx->debug) {
             fprintf(stderr,
-                    "ERROR Too many holding registers wrote (%d > %d)\n",
+                    "ERROR Too many registers to write (%d > %d)\n",
                     write_nb, MODBUS_MAX_RW_WRITE_REGISTERS);
         }
         errno = EMBMDATA;
diff --git a/src/modbus.h b/src/modbus.h
index 8f60859..00d7a3e 100644
--- a/src/modbus.h
+++ b/src/modbus.h
@@ -182,9 +182,9 @@ int modbus_write_bit(modbus_t *ctx, int coil_addr, int state);
 int modbus_write_register(modbus_t *ctx, int reg_addr, int value);
 int modbus_write_bits(modbus_t *ctx, int addr, int nb, const uint8_t *data);
 int modbus_write_registers(modbus_t *ctx, int addr, int nb, const uint16_t *data);
-int modbus_read_and_write_holding_registers(modbus_t *ctx, int read_addr,
-                                     int read_nb, uint16_t *dest, int write_addr,
-                                     int write_nb, const uint16_t *data);
+int modbus_read_and_write_registers(modbus_t *ctx, int read_addr,
+                                    int read_nb, uint16_t *dest, int write_addr,
+                                    int write_nb, const uint16_t *data);
 int modbus_report_slave_id(modbus_t *ctx, uint8_t *dest);
 
 modbus_mapping_t* modbus_mapping_new(int nb_coil_status, int nb_input_status,
diff --git a/tests/bandwidth-client.c b/tests/bandwidth-client.c
index 44d8fae..89df7f8 100644
--- a/tests/bandwidth-client.c
+++ b/tests/bandwidth-client.c
@@ -148,7 +148,9 @@ int main(void)
     nb_points = MODBUS_MAX_RW_WRITE_REGISTERS;
     start = gettime_ms();
     for (i=0; i<NB_LOOPS; i++) {
-        rc = modbus_read_and_write_holding_registers(ctx, 0, nb_points, tab_reg,0, nb_points, tab_reg);
+        rc = modbus_read_and_write_registers(ctx,
+                                             0, nb_points, tab_reg,
+                                             0, nb_points, tab_reg);
         if (rc == -1) {
             fprintf(stderr, "%s\n", modbus_strerror(errno));
             return -1;
diff --git a/tests/random-test-client.c b/tests/random-test-client.c
index cf64fe7..f6f6cef 100644
--- a/tests/random-test-client.c
+++ b/tests/random-test-client.c
@@ -193,9 +193,10 @@ int main(void)
                     }
                 }
             }
-            /* R/W MULTIPLE REGISTERS*/
-            rc = modbus_read_and_write_holding_registers(ctx, addr, nb, tab_rp_registers,
-                                                         addr, nb, tab_rw_rq_registers);
+            /* R/W MULTIPLE REGISTERS */
+            rc = modbus_read_and_write_registers(ctx,
+                                                 addr, nb, tab_rp_registers,
+                                                 addr, nb, tab_rw_rq_registers);
             if (rc != nb) {
                 printf("ERROR modbus_read_and_write_registers (%d)\n", rc);
                 printf("Address = %d, nb = %d\n", addr, nb);
diff --git a/tests/unit-test-client.c b/tests/unit-test-client.c
index 65f823f..d9fbe72 100644
--- a/tests/unit-test-client.c
+++ b/tests/unit-test-client.c
@@ -247,13 +247,13 @@ int main(void)
 
     /* Write registers to zero from tab_rp_registers and read registers to
        tab_rp_registers.  They should be same as UT_REGISTERS_TAB. */
-    rc = modbus_read_and_write_holding_registers(ctx,
-                                                 UT_REGISTERS_ADDRESS,
-                                                 UT_REGISTERS_NB_POINTS,
-                                                 tab_rp_registers,
-                                                 UT_REGISTERS_ADDRESS,
-                                                 UT_REGISTERS_NB_POINTS,
-                                                 tab_rp_registers);
+    rc = modbus_read_and_write_registers(ctx,
+                                         UT_REGISTERS_ADDRESS,
+                                         UT_REGISTERS_NB_POINTS,
+                                         tab_rp_registers,
+                                         UT_REGISTERS_ADDRESS,
+                                         UT_REGISTERS_NB_POINTS,
+                                         tab_rp_registers);
     printf("4/5 modbus_read_and_write_registers, read part: ");
     if (rc != UT_REGISTERS_NB_POINTS) {
         printf("FAILED (nb points %d)\n", rc);