diff --git a/query_classifier/test/compare.cc b/query_classifier/test/compare.cc
index 47fe617c8..cd5ecb303 100644
--- a/query_classifier/test/compare.cc
+++ b/query_classifier/test/compare.cc
@@ -25,7 +25,7 @@
 #include <maxscale/log_manager.h>
 #include <maxscale/protocol/mysql.h>
 #include <maxscale/query_classifier.h>
-#include "../../server/modules/protocol/MySQL/MySQLClient/setsqlmodeparser.hh"
+#include "../../server/modules/protocol/MySQL/mariadbclient/setsqlmodeparser.hh"
 #include "testreader.hh"
 using std::cerr;
 using std::cin;
diff --git a/server/core/load_utils.cc b/server/core/load_utils.cc
index b313d68a9..1c56da641 100644
--- a/server/core/load_utils.cc
+++ b/server/core/load_utils.cc
@@ -62,7 +62,8 @@ struct NAME_MAPPING
 
 static NAME_MAPPING name_mappings[] =
 {
-    { MODULE_MONITOR, "mysqlmon", "mariadbmon", false }
+    { MODULE_MONITOR,  "mysqlmon",    "mariadbmon",    false },
+    { MODULE_PROTOCOL, "mysqlclient", "mariadbclient", false }
 };
 
 static const size_t N_NAME_MAPPINGS = sizeof(name_mappings) / sizeof(name_mappings[0]);
diff --git a/server/modules/protocol/MySQL/CMakeLists.txt b/server/modules/protocol/MySQL/CMakeLists.txt
index 75471c144..31730dc9b 100644
--- a/server/modules/protocol/MySQL/CMakeLists.txt
+++ b/server/modules/protocol/MySQL/CMakeLists.txt
@@ -3,6 +3,6 @@ target_link_libraries(mysqlcommon maxscale-common)
 set_target_properties(mysqlcommon PROPERTIES VERSION "2.0.0")
 install_module(mysqlcommon core)
 
-add_subdirectory(MySQLBackend)
-add_subdirectory(MySQLClient)
+add_subdirectory(mariadbbackend)
+add_subdirectory(mariadbclient)
 add_subdirectory(test)
diff --git a/server/modules/protocol/MySQL/MySQLClient/CMakeLists.txt b/server/modules/protocol/MySQL/MySQLClient/CMakeLists.txt
deleted file mode 100644
index 5d2c56b7b..000000000
--- a/server/modules/protocol/MySQL/MySQLClient/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-add_library(mysqlclient SHARED mysql_client.cc)
-target_link_libraries(mysqlclient maxscale-common mysqlcommon)
-set_target_properties(mysqlclient PROPERTIES VERSION "1.0.0")
-install_module(mysqlclient core)
-
-if(BUILD_TESTS)
-  add_subdirectory(test)
-endif()
diff --git a/server/modules/protocol/MySQL/mariadbclient/CMakeLists.txt b/server/modules/protocol/MySQL/mariadbclient/CMakeLists.txt
new file mode 100644
index 000000000..9462f0506
--- /dev/null
+++ b/server/modules/protocol/MySQL/mariadbclient/CMakeLists.txt
@@ -0,0 +1,8 @@
+add_library(mariadbclient SHARED mysql_client.cc)
+target_link_libraries(mariadbclient maxscale-common mysqlcommon)
+set_target_properties(mariadbclient PROPERTIES VERSION "1.0.0")
+install_module(mariadbclient core)
+
+if(BUILD_TESTS)
+  add_subdirectory(test)
+endif()
diff --git a/server/modules/protocol/MySQL/MySQLClient/mysql_client.cc b/server/modules/protocol/MySQL/mariadbclient/mysql_client.cc
similarity index 99%
rename from server/modules/protocol/MySQL/MySQLClient/mysql_client.cc
rename to server/modules/protocol/MySQL/mariadbclient/mysql_client.cc
index 4ee98a481..0055b528b 100644
--- a/server/modules/protocol/MySQL/MySQLClient/mysql_client.cc
+++ b/server/modules/protocol/MySQL/mariadbclient/mysql_client.cc
@@ -12,7 +12,7 @@
  * Public License.
  */
 
-#define MXS_MODULE_NAME "MySQLClient"
+#define MXS_MODULE_NAME "mariadbclient"
 
 #include <maxscale/cppdefs.hh>
 
diff --git a/server/modules/protocol/MySQL/MySQLClient/setsqlmodeparser.hh b/server/modules/protocol/MySQL/mariadbclient/setsqlmodeparser.hh
similarity index 100%
rename from server/modules/protocol/MySQL/MySQLClient/setsqlmodeparser.hh
rename to server/modules/protocol/MySQL/mariadbclient/setsqlmodeparser.hh
diff --git a/server/modules/protocol/MySQL/MySQLClient/test/CMakeLists.txt b/server/modules/protocol/MySQL/mariadbclient/test/CMakeLists.txt
similarity index 100%
rename from server/modules/protocol/MySQL/MySQLClient/test/CMakeLists.txt
rename to server/modules/protocol/MySQL/mariadbclient/test/CMakeLists.txt
diff --git a/server/modules/protocol/MySQL/MySQLClient/test/test_setsqlmodeparser.cc b/server/modules/protocol/MySQL/mariadbclient/test/test_setsqlmodeparser.cc
similarity index 100%
rename from server/modules/protocol/MySQL/MySQLClient/test/test_setsqlmodeparser.cc
rename to server/modules/protocol/MySQL/mariadbclient/test/test_setsqlmodeparser.cc
diff --git a/server/modules/protocol/MySQL/test/test_parse_kill.cc b/server/modules/protocol/MySQL/test/test_parse_kill.cc
index a8310f676..b0cb30a72 100644
--- a/server/modules/protocol/MySQL/test/test_parse_kill.cc
+++ b/server/modules/protocol/MySQL/test/test_parse_kill.cc
@@ -1,6 +1,6 @@
 #include <maxscale/cdefs.h>
 
-#include "../MySQLClient/mysql_client.cc"
+#include "../mariadbclient/mysql_client.cc"
 
 #define NO_THREAD_ID 0