Reword example and documentations from master/slave to client/server

Task-number: QTBUG-91213
Task-number: QTBUG-91212
Task-number: QTBUG-91211
Change-Id: I2b585d73b5fa3194459709fa57d44a8f42dceeed
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>

44 files changed, 69 insertions, 79 deletions

diff --git a/examples/serialbus/modbus/CMakeLists.txt b/examples/serialbus/modbus/CMakeLists.txt
index 2e6b6cb..6de7ee7 100644
--- a/examples/serialbus/modbus/CMakeLists.txt
+++ b/examples/serialbus/modbus/CMakeLists.txt
@@ -1,5 +1,5 @@
-add_subdirectory(master)
-add_subdirectory(slave)
+add_subdirectory(client)
+add_subdirectory(server)
 add_subdirectory(custom)
 
 if(QT_FEATURE_modbus_serialport)
diff --git a/examples/serialbus/modbus/master/CMakeLists.txt b/examples/serialbus/modbus/client/CMakeLists.txt
index e7c2900..09ae8f5 100644
--- a/examples/serialbus/modbus/master/CMakeLists.txt
+++ b/examples/serialbus/modbus/client/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.14)
-project(modbusmaster LANGUAGES CXX)
+project(modbusclient LANGUAGES CXX)
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
@@ -11,24 +11,24 @@ if(NOT DEFINED INSTALL_EXAMPLESDIR)
   set(INSTALL_EXAMPLESDIR "examples")
 endif()
 
-set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/serialbus/modbus/master")
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/serialbus/modbus/client")
 
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS SerialBus)
 find_package(Qt6 COMPONENTS Widgets)
 
-qt_add_executable(modbusmaster
+qt_add_executable(modbusclient
     main.cpp
     mainwindow.cpp mainwindow.h mainwindow.ui
     settingsdialog.cpp settingsdialog.h settingsdialog.ui
     writeregistermodel.cpp writeregistermodel.h
 )
-set_target_properties(modbusmaster PROPERTIES
+set_target_properties(modbusclient PROPERTIES
     WIN32_EXECUTABLE TRUE
     MACOSX_BUNDLE TRUE
 )
-target_link_libraries(modbusmaster PUBLIC
+target_link_libraries(modbusclient PUBLIC
     Qt::Core
     Qt::Gui
     Qt::SerialBus
@@ -37,27 +37,27 @@ target_link_libraries(modbusmaster PUBLIC
 
 
 # Resources:
-set(master_resource_files
+set(client_resource_files
     "images/application-exit.png"
     "images/connect.png"
     "images/disconnect.png"
     "images/settings.png"
 )
 
-qt6_add_resources(modbusmaster "master"
+qt6_add_resources(modbusclient "client"
     PREFIX
         "/"
     FILES
-        ${master_resource_files}
+        ${client_resource_files}
 )
 
 if(QT_FEATURE_modbus_serialport)
-    target_link_libraries(modbusmaster PUBLIC
+    target_link_libraries(modbusclient PUBLIC
         Qt::SerialPort
     )
 endif()
 
-install(TARGETS modbusmaster
+install(TARGETS modbusclient
     RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
     LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/serialbus/modbus/master/master.pro b/examples/serialbus/modbus/client/client.pro
index d7a4885..fa31012 100644
--- a/examples/serialbus/modbus/master/master.pro
+++ b/examples/serialbus/modbus/client/client.pro
@@ -3,7 +3,7 @@ requires(qtConfig(combobox))
 
 qtConfig(modbus-serialport): QT += serialport
 
-TARGET = modbusmaster
+TARGET = modbusclient
 TEMPLATE = app
 CONFIG += c++11
 
@@ -23,7 +23,7 @@ FORMS += \
     settingsdialog.ui
 
 RESOURCES += \
-    master.qrc
+    client.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/serialbus/modbus/master
+target.path = $$[QT_INSTALL_EXAMPLES]/serialbus/modbus/client
 INSTALLS += target
diff --git a/examples/serialbus/modbus/master/master.qrc b/examples/serialbus/modbus/client/client.qrc
index 5e8e998..5e8e998 100644
--- a/examples/serialbus/modbus/master/master.qrc
+++ b/examples/serialbus/modbus/client/client.qrc
diff --git a/examples/serialbus/modbus/client/doc/images/modbusclient.png b/examples/serialbus/modbus/client/doc/images/modbusclient.png
new file mode 100644
index 0000000..b2d771c
--- /dev/null
+++ b/examples/serialbus/modbus/client/doc/images/modbusclient.png
diff --git a/examples/serialbus/modbus/master/doc/src/modbusmaster.qdoc b/examples/serialbus/modbus/client/doc/src/modbusclient.qdoc
index 8731859..7467b6c 100644
--- a/examples/serialbus/modbus/master/doc/src/modbusmaster.qdoc
+++ b/examples/serialbus/modbus/client/doc/src/modbusclient.qdoc
@@ -25,19 +25,19 @@
 **
 ****************************************************************************/
 
-/*! \example modbus/master
-    \title Modbus Master example
+/*! \example modbus/client
+    \title Modbus Client example
 
-    \brief The example implements a Modbus master application.
+    \brief The example implements a Modbus client application.
 
-    The example acts as Modbus master sending Modbus request via serial line
-    and TCP respectively. The shown dialog allows the definition of standard requests and
-    displays incoming responses.
+    The example acts as Modbus client sending Modbus request via serial line
+    and TCP respectively. The shown dialog allows the definition of standard
+    requests and displays incoming responses.
 
-    \image ../images/modbusmaster.png
+    \image ../images/modbusclient.png
 
     \include examples-run.qdocinc
 
-    The example must be used in conjunction with the \l {Modbus Slave example} or another
-    Modbus device which is either connected via TCP or Serial Port.
+    The example must be used in conjunction with the \l {Modbus server example}
+    or another Modbus device which is either connected via TCP or Serial Port.
 */
diff --git a/examples/serialbus/modbus/master/images/application-exit.png b/examples/serialbus/modbus/client/images/application-exit.png
index 32be6b3..32be6b3 100644
--- a/examples/serialbus/modbus/master/images/application-exit.png
+++ b/examples/serialbus/modbus/client/images/application-exit.png
diff --git a/examples/serialbus/modbus/master/images/connect.png b/examples/serialbus/modbus/client/images/connect.png
index dd5a51e..dd5a51e 100644
--- a/examples/serialbus/modbus/master/images/connect.png
+++ b/examples/serialbus/modbus/client/images/connect.png
diff --git a/examples/serialbus/modbus/master/images/disconnect.png b/examples/serialbus/modbus/client/images/disconnect.png
index fd58f7a..fd58f7a 100644
--- a/examples/serialbus/modbus/master/images/disconnect.png
+++ b/examples/serialbus/modbus/client/images/disconnect.png
diff --git a/examples/serialbus/modbus/master/images/settings.png b/examples/serialbus/modbus/client/images/settings.png
index 3d1042e..3d1042e 100644
--- a/examples/serialbus/modbus/master/images/settings.png
+++ b/examples/serialbus/modbus/client/images/settings.png
diff --git a/examples/serialbus/modbus/master/main.cpp b/examples/serialbus/modbus/client/main.cpp
index 19a1d5b..19a1d5b 100644
--- a/examples/serialbus/modbus/master/main.cpp
+++ b/examples/serialbus/modbus/client/main.cpp
diff --git a/examples/serialbus/modbus/master/mainwindow.cpp b/examples/serialbus/modbus/client/mainwindow.cpp
index 9bd4ae1..a7d1d5e 100644
--- a/examples/serialbus/modbus/master/mainwindow.cpp
+++ b/examples/serialbus/modbus/client/mainwindow.cpp
@@ -186,10 +186,7 @@ void MainWindow::onConnectTypeChanged(int index)
 
     if (!modbusDevice) {
         ui->connectButton->setDisabled(true);
-        if (type == Serial)
-            statusBar()->showMessage(tr("Could not create Modbus master."), 5000);
-        else
-            statusBar()->showMessage(tr("Could not create Modbus client."), 5000);
+        statusBar()->showMessage(tr("Could not create Modbus client."), 5000);
     } else {
         connect(modbusDevice, &QModbusClient::stateChanged,
                 this, &MainWindow::onModbusStateChanged);
diff --git a/examples/serialbus/modbus/master/mainwindow.h b/examples/serialbus/modbus/client/mainwindow.h
index 186d004..186d004 100644
--- a/examples/serialbus/modbus/master/mainwindow.h
+++ b/examples/serialbus/modbus/client/mainwindow.h
diff --git a/examples/serialbus/modbus/master/mainwindow.ui b/examples/serialbus/modbus/client/mainwindow.ui
index bf80826..4c4eb4e 100644
--- a/examples/serialbus/modbus/master/mainwindow.ui
+++ b/examples/serialbus/modbus/client/mainwindow.ui
@@ -461,7 +461,7 @@
   </widget>
   <action name="actionConnect">
    <property name="icon">
-    <iconset resource="master.qrc">
+    <iconset resource="client.qrc">
      <normaloff>:/images/connect.png</normaloff>:/images/connect.png</iconset>
    </property>
    <property name="text">
@@ -470,7 +470,7 @@
   </action>
   <action name="actionDisconnect">
    <property name="icon">
-    <iconset resource="master.qrc">
+    <iconset resource="client.qrc">
      <normaloff>:/images/disconnect.png</normaloff>:/images/disconnect.png</iconset>
    </property>
    <property name="text">
@@ -479,7 +479,7 @@
   </action>
   <action name="actionExit">
    <property name="icon">
-    <iconset resource="master.qrc">
+    <iconset resource="client.qrc">
      <normaloff>:/images/application-exit.png</normaloff>:/images/application-exit.png</iconset>
    </property>
    <property name="text">
@@ -488,7 +488,7 @@
   </action>
   <action name="actionOptions">
    <property name="icon">
-    <iconset resource="master.qrc">
+    <iconset resource="client.qrc">
      <normaloff>:/images/settings.png</normaloff>:/images/settings.png</iconset>
    </property>
    <property name="text">
@@ -514,7 +514,7 @@
   <tabstop>readWriteButton</tabstop>
  </tabstops>
  <resources>
-  <include location="master.qrc"/>
+  <include location="client.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/examples/serialbus/modbus/master/settingsdialog.cpp b/examples/serialbus/modbus/client/settingsdialog.cpp
index 0a5eb43..0a5eb43 100644
--- a/examples/serialbus/modbus/master/settingsdialog.cpp
+++ b/examples/serialbus/modbus/client/settingsdialog.cpp
diff --git a/examples/serialbus/modbus/master/settingsdialog.h b/examples/serialbus/modbus/client/settingsdialog.h
index fbeb97a..fbeb97a 100644
--- a/examples/serialbus/modbus/master/settingsdialog.h
+++ b/examples/serialbus/modbus/client/settingsdialog.h
diff --git a/examples/serialbus/modbus/master/settingsdialog.ui b/examples/serialbus/modbus/client/settingsdialog.ui
index fb594f4..fb594f4 100644
--- a/examples/serialbus/modbus/master/settingsdialog.ui
+++ b/examples/serialbus/modbus/client/settingsdialog.ui
diff --git a/examples/serialbus/modbus/master/writeregistermodel.cpp b/examples/serialbus/modbus/client/writeregistermodel.cpp
index 441f643..441f643 100644
--- a/examples/serialbus/modbus/master/writeregistermodel.cpp
+++ b/examples/serialbus/modbus/client/writeregistermodel.cpp
diff --git a/examples/serialbus/modbus/master/writeregistermodel.h b/examples/serialbus/modbus/client/writeregistermodel.h
index 4f29812..4f29812 100644
--- a/examples/serialbus/modbus/master/writeregistermodel.h
+++ b/examples/serialbus/modbus/client/writeregistermodel.h
diff --git a/examples/serialbus/modbus/master/doc/images/modbusmaster.png b/examples/serialbus/modbus/master/doc/images/modbusmaster.png
deleted file mode 100644
index faf66c7..0000000
--- a/examples/serialbus/modbus/master/doc/images/modbusmaster.png
+++ /dev/null
diff --git a/examples/serialbus/modbus/modbus.pro b/examples/serialbus/modbus/modbus.pro
index 9e94be7..bdcf5b5 100644
--- a/examples/serialbus/modbus/modbus.pro
+++ b/examples/serialbus/modbus/modbus.pro
@@ -1,7 +1,7 @@
 TEMPLATE = subdirs
 
 SUBDIRS += \
-    master \
-    slave \
+    client \
+    server \
     adueditor \
     custom
diff --git a/examples/serialbus/modbus/slave/CMakeLists.txt b/examples/serialbus/modbus/server/CMakeLists.txt
index 69c18cf..8b762da 100644
--- a/examples/serialbus/modbus/slave/CMakeLists.txt
+++ b/examples/serialbus/modbus/server/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.14)
-project(modbusslave LANGUAGES CXX)
+project(modbusserver LANGUAGES CXX)
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
@@ -11,23 +11,23 @@ if(NOT DEFINED INSTALL_EXAMPLESDIR)
   set(INSTALL_EXAMPLESDIR "examples")
 endif()
 
-set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/serialbus/modbus/slave")
+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/serialbus/modbus/server")
 
 find_package(Qt6 COMPONENTS Core)
 find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS SerialBus)
 find_package(Qt6 COMPONENTS Widgets)
 
-qt_add_executable(modbusslave
+qt_add_executable(modbusserver
     main.cpp
     mainwindow.cpp mainwindow.h mainwindow.ui
     settingsdialog.cpp settingsdialog.h settingsdialog.ui
 )
-set_target_properties(modbusslave PROPERTIES
+set_target_properties(modbusserver PROPERTIES
     WIN32_EXECUTABLE TRUE
     MACOSX_BUNDLE TRUE
 )
-target_link_libraries(modbusslave PUBLIC
+target_link_libraries(modbusserver PUBLIC
     Qt::Core
     Qt::Gui
     Qt::SerialBus
@@ -36,27 +36,27 @@ target_link_libraries(modbusslave PUBLIC
 
 
 # Resources:
-set(slave_resource_files
+set(server_resource_files
     "images/application-exit.png"
     "images/connect.png"
     "images/disconnect.png"
     "images/settings.png"
 )
 
-qt6_add_resources(modbusslave "slave"
+qt6_add_resources(modbusserver "server"
     PREFIX
         "/"
     FILES
-        ${slave_resource_files}
+        ${server_resource_files}
 )
 
 if(QT_FEATURE_modbus_serialport)
-    target_link_libraries(modbusslave PUBLIC
+    target_link_libraries(modbusserver PUBLIC
         Qt::SerialPort
     )
 endif()
 
-install(TARGETS modbusslave
+install(TARGETS modbusserver
     RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
     BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
     LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
diff --git a/examples/serialbus/modbus/server/doc/images/modbusserver.png b/examples/serialbus/modbus/server/doc/images/modbusserver.png
new file mode 100644
index 0000000..1506382
--- /dev/null
+++ b/examples/serialbus/modbus/server/doc/images/modbusserver.png
diff --git a/examples/serialbus/modbus/slave/doc/src/modbusslave.qdoc b/examples/serialbus/modbus/server/doc/src/modbusserver.qdoc
index a352215..9e99841 100644
--- a/examples/serialbus/modbus/slave/doc/src/modbusslave.qdoc
+++ b/examples/serialbus/modbus/server/doc/src/modbusserver.qdoc
@@ -25,21 +25,21 @@
 **
 ****************************************************************************/
 
-/*! \example modbus/slave
-    \title Modbus Slave example
+/*! \example modbus/server
+    \title Modbus Server example
 
-    \brief The example implements a Modbus slave application.
+    \brief The example implements a Modbus server application.
 
-    The example acts as Modbus slave. It receives standard Modbus requests,
+    The example acts as Modbus server. It receives standard Modbus requests,
     adjusts its internal states based on the request and responds with the
-    appropriate reply. As such a slave is the equivalent of a Modbus server.
+    appropriate reply. As such a server is the equivalent of a Modbus server.
 
     \image ../images/modbusserver.png
 
     \include examples-run.qdocinc
 
-    This example must be used in conjunction with the \l {Modbus Master example}.
+    This example must be used in conjunction with the \l {Modbus Client example}.
     This example should be started and put into the listen state before
-    the Modbus master example is started. Subsequent interactions between the two examples
+    the Modbus client example is started. Subsequent interactions between the two examples
     use the Modbus protocol.
 */
diff --git a/examples/serialbus/modbus/slave/images/application-exit.png b/examples/serialbus/modbus/server/images/application-exit.png
index 32be6b3..32be6b3 100644
--- a/examples/serialbus/modbus/slave/images/application-exit.png
+++ b/examples/serialbus/modbus/server/images/application-exit.png
diff --git a/examples/serialbus/modbus/slave/images/connect.png b/examples/serialbus/modbus/server/images/connect.png
index dd5a51e..dd5a51e 100644
--- a/examples/serialbus/modbus/slave/images/connect.png
+++ b/examples/serialbus/modbus/server/images/connect.png
diff --git a/examples/serialbus/modbus/slave/images/disconnect.png b/examples/serialbus/modbus/server/images/disconnect.png
index fd58f7a..fd58f7a 100644
--- a/examples/serialbus/modbus/slave/images/disconnect.png
+++ b/examples/serialbus/modbus/server/images/disconnect.png
diff --git a/examples/serialbus/modbus/slave/images/settings.png b/examples/serialbus/modbus/server/images/settings.png
index 3d1042e..3d1042e 100644
--- a/examples/serialbus/modbus/slave/images/settings.png
+++ b/examples/serialbus/modbus/server/images/settings.png
diff --git a/examples/serialbus/modbus/slave/main.cpp b/examples/serialbus/modbus/server/main.cpp
index 19a1d5b..19a1d5b 100644
--- a/examples/serialbus/modbus/slave/main.cpp
+++ b/examples/serialbus/modbus/server/main.cpp
diff --git a/examples/serialbus/modbus/slave/mainwindow.cpp b/examples/serialbus/modbus/server/mainwindow.cpp
index 5ebdaff..5307f66 100644
--- a/examples/serialbus/modbus/slave/mainwindow.cpp
+++ b/examples/serialbus/modbus/server/mainwindow.cpp
@@ -136,10 +136,7 @@ void MainWindow::onCurrentConnectTypeChanged(int index)
 
     if (!modbusDevice) {
         ui->connectButton->setDisabled(true);
-        if (type == Serial)
-            statusBar()->showMessage(tr("Could not create Modbus slave."), 5000);
-        else
-            statusBar()->showMessage(tr("Could not create Modbus server."), 5000);
+        statusBar()->showMessage(tr("Could not create Modbus server."), 5000);
     } else {
         QModbusDataUnitMap reg;
         reg.insert(QModbusDataUnit::Coils, { QModbusDataUnit::Coils, 0, 10 });
diff --git a/examples/serialbus/modbus/slave/mainwindow.h b/examples/serialbus/modbus/server/mainwindow.h
index e824649..e824649 100644
--- a/examples/serialbus/modbus/slave/mainwindow.h
+++ b/examples/serialbus/modbus/server/mainwindow.h
diff --git a/examples/serialbus/modbus/slave/mainwindow.ui b/examples/serialbus/modbus/server/mainwindow.ui
index 2a2107e..6b912cc 100644
--- a/examples/serialbus/modbus/slave/mainwindow.ui
+++ b/examples/serialbus/modbus/server/mainwindow.ui
@@ -776,7 +776,7 @@
   </widget>
   <action name="actionConnect">
    <property name="icon">
-    <iconset resource="slave.qrc">
+    <iconset resource="server.qrc">
      <normaloff>:/images/connect.png</normaloff>:/images/connect.png</iconset>
    </property>
    <property name="text">
@@ -785,7 +785,7 @@
   </action>
   <action name="actionDisconnect">
    <property name="icon">
-    <iconset resource="slave.qrc">
+    <iconset resource="server.qrc">
      <normaloff>:/images/disconnect.png</normaloff>:/images/disconnect.png</iconset>
    </property>
    <property name="text">
@@ -794,7 +794,7 @@
   </action>
   <action name="actionExit">
    <property name="icon">
-    <iconset resource="slave.qrc">
+    <iconset resource="server.qrc">
      <normaloff>:/images/application-exit.png</normaloff>:/images/application-exit.png</iconset>
    </property>
    <property name="text">
@@ -803,7 +803,7 @@
   </action>
   <action name="actionOptions">
    <property name="icon">
-    <iconset resource="slave.qrc">
+    <iconset resource="server.qrc">
      <normaloff>:/images/settings.png</normaloff>:/images/settings.png</iconset>
    </property>
    <property name="text">
@@ -859,7 +859,7 @@
   <tabstop>holdReg_9</tabstop>
  </tabstops>
  <resources>
-  <include location="slave.qrc"/>
+  <include location="server.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/examples/serialbus/modbus/slave/slave.pro b/examples/serialbus/modbus/server/server.pro
index 2e128c2..5235770 100644
--- a/examples/serialbus/modbus/slave/slave.pro
+++ b/examples/serialbus/modbus/server/server.pro
@@ -3,7 +3,7 @@ requires(qtConfig(combobox))
 
 qtConfig(modbus-serialport): QT += serialport
 
-TARGET = modbusslave
+TARGET = modbusserver
 TEMPLATE = app
 CONFIG += c++11
 
@@ -20,7 +20,7 @@ FORMS += \
     mainwindow.ui \
     settingsdialog.ui
 
-RESOURCES += slave.qrc
+RESOURCES += server.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/serialbus/modbus/slave
+target.path = $$[QT_INSTALL_EXAMPLES]/serialbus/modbus/server
 INSTALLS += target
diff --git a/examples/serialbus/modbus/slave/slave.qrc b/examples/serialbus/modbus/server/server.qrc
index 5e8e998..5e8e998 100644
--- a/examples/serialbus/modbus/slave/slave.qrc
+++ b/examples/serialbus/modbus/server/server.qrc
diff --git a/examples/serialbus/modbus/slave/settingsdialog.cpp b/examples/serialbus/modbus/server/settingsdialog.cpp
index 77ec8af..77ec8af 100644
--- a/examples/serialbus/modbus/slave/settingsdialog.cpp
+++ b/examples/serialbus/modbus/server/settingsdialog.cpp
diff --git a/examples/serialbus/modbus/slave/settingsdialog.h b/examples/serialbus/modbus/server/settingsdialog.h
index dfe7b98..dfe7b98 100644
--- a/examples/serialbus/modbus/slave/settingsdialog.h
+++ b/examples/serialbus/modbus/server/settingsdialog.h
diff --git a/examples/serialbus/modbus/slave/settingsdialog.ui b/examples/serialbus/modbus/server/settingsdialog.ui
index bdb86e0..bdb86e0 100644
--- a/examples/serialbus/modbus/slave/settingsdialog.ui
+++ b/examples/serialbus/modbus/server/settingsdialog.ui
diff --git a/examples/serialbus/modbus/slave/doc/images/modbusserver.png b/examples/serialbus/modbus/slave/doc/images/modbusserver.png
deleted file mode 100644
index 795457a..0000000
--- a/examples/serialbus/modbus/slave/doc/images/modbusserver.png
+++ /dev/null
diff --git a/src/serialbus/doc/src/qtserialbus-index.qdoc b/src/serialbus/doc/src/qtserialbus-index.qdoc
index db9f241..ca2c54d 100644
--- a/src/serialbus/doc/src/qtserialbus-index.qdoc
+++ b/src/serialbus/doc/src/qtserialbus-index.qdoc
@@ -104,7 +104,7 @@
 
     \list
          \li \l {CAN Bus Example}
-         \li \l {Modbus Master example}
-         \li \l {Modbus Slave example}
+         \li \l {Modbus Client example}
+         \li \l {Modbus Server example}
     \endlist
 */
diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt
index 9fb8825..a89c1e3 100644
--- a/tests/auto/CMakeLists.txt
+++ b/tests/auto/CMakeLists.txt
@@ -12,7 +12,7 @@ add_subdirectory(qmodbusadu)
 add_subdirectory(qmodbusdeviceidentification)
 add_subdirectory(plugins)
 if(QT_FEATURE_modbus_serialport)
-    add_subdirectory(qmodbusrtuserialmaster)
+    add_subdirectory(qmodbusrtuserialclient)
 endif()
 if(NOT ANDROID)
     add_subdirectory(qcanbus)
diff --git a/tests/auto/qmodbusadu/tst_qmodbusadu.cpp b/tests/auto/qmodbusadu/tst_qmodbusadu.cpp
index 71c0fe4..f4e56a8 100644
--- a/tests/auto/qmodbusadu/tst_qmodbusadu.cpp
+++ b/tests/auto/qmodbusadu/tst_qmodbusadu.cpp
@@ -60,7 +60,7 @@ private slots:
         QCOMPARE(adu.rawData(), QByteArray::fromHex("f00103001200080f1d"));
     }
 
-    void testSlaveAddress()
+    void testServerAddress()
     {
         QModbusSerialAdu adu(QModbusSerialAdu::Ascii, ":f0010300120008f2\r\n");
         QCOMPARE(adu.serverAddress(), 240);
diff --git a/tests/auto/qmodbusrtuserialclient/CMakeLists.txt b/tests/auto/qmodbusrtuserialclient/CMakeLists.txt
new file mode 100644
index 0000000..4cebfed
--- /dev/null
+++ b/tests/auto/qmodbusrtuserialclient/CMakeLists.txt
@@ -0,0 +1,6 @@
+qt_internal_add_test(tst_qmodbusrtuserialclient
+    SOURCES
+        tst_qmodbusrtuserialclient.cpp
+    PUBLIC_LIBRARIES
+        Qt::SerialBus
+)
diff --git a/tests/auto/qmodbusrtuserialmaster/tst_qmodbusrtuserialmaster.cpp b/tests/auto/qmodbusrtuserialclient/tst_qmodbusrtuserialclient.cpp
index c8a52b8..d311c84 100644
--- a/tests/auto/qmodbusrtuserialmaster/tst_qmodbusrtuserialmaster.cpp
+++ b/tests/auto/qmodbusrtuserialclient/tst_qmodbusrtuserialclient.cpp
@@ -58,4 +58,4 @@ private slots:
 
 QTEST_MAIN(tst_QModbusRtuSerialClient)
 
-#include "tst_qmodbusrtuserialmaster.moc"
+#include "tst_qmodbusrtuserialclient.moc"
diff --git a/tests/auto/qmodbusrtuserialmaster/CMakeLists.txt b/tests/auto/qmodbusrtuserialmaster/CMakeLists.txt
deleted file mode 100644
index 20e75ae..0000000
--- a/tests/auto/qmodbusrtuserialmaster/CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-#####################################################################
-## tst_qmodbusrtuserialmaster Test:
-#####################################################################
-
-qt_internal_add_test(tst_qmodbusrtuserialmaster
-    SOURCES
-        tst_qmodbusrtuserialmaster.cpp
-    PUBLIC_LIBRARIES
-        Qt::SerialBus
-)