diff --git a/server/core/load_utils.cc b/server/core/load_utils.cc
index 1c56da641..8e851bde1 100644
--- a/server/core/load_utils.cc
+++ b/server/core/load_utils.cc
@@ -62,8 +62,9 @@ struct NAME_MAPPING
 
 static NAME_MAPPING name_mappings[] =
 {
-    { MODULE_MONITOR,  "mysqlmon",    "mariadbmon",    false },
-    { MODULE_PROTOCOL, "mysqlclient", "mariadbclient", false }
+    { MODULE_MONITOR,  "mysqlmon",     "mariadbmon",     false },
+    { MODULE_PROTOCOL, "mysqlclient",  "mariadbclient",  false },
+    { MODULE_PROTOCOL, "mysqlbackend", "mariadbbackend", false }
 };
 
 static const size_t N_NAME_MAPPINGS = sizeof(name_mappings) / sizeof(name_mappings[0]);
diff --git a/server/modules/protocol/MySQL/MySQLBackend/CMakeLists.txt b/server/modules/protocol/MySQL/MySQLBackend/CMakeLists.txt
deleted file mode 100644
index 1da92086b..000000000
--- a/server/modules/protocol/MySQL/MySQLBackend/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-add_library(mysqlbackend SHARED mysql_backend.c)
-# TODO: Refactor MySQLBackend so that COM_CHANGE_USER processing is
-# transparent to the protocol module. After this change, we don't need to
-# link against MySQLAuth.
-target_link_libraries(mysqlbackend maxscale-common mysqlcommon mysqlauth)
-set_target_properties(mysqlbackend PROPERTIES VERSION "2.0.0")
-install_module(mysqlbackend core)
diff --git a/server/modules/protocol/MySQL/mariadbbackend/CMakeLists.txt b/server/modules/protocol/MySQL/mariadbbackend/CMakeLists.txt
new file mode 100644
index 000000000..718ced46e
--- /dev/null
+++ b/server/modules/protocol/MySQL/mariadbbackend/CMakeLists.txt
@@ -0,0 +1,7 @@
+add_library(mariadbbackend SHARED mysql_backend.c)
+# TODO: Refactor mariadbbackend so that COM_CHANGE_USER processing is
+# transparent to the protocol module. After this change, we don't need to
+# link against mysqlauth.
+target_link_libraries(mariadbbackend maxscale-common mysqlcommon mysqlauth)
+set_target_properties(mariadbbackend PROPERTIES VERSION "2.0.0")
+install_module(mariadbbackend core)
diff --git a/server/modules/protocol/MySQL/MySQLBackend/mysql_backend.c b/server/modules/protocol/MySQL/mariadbbackend/mysql_backend.c
similarity index 99%
rename from server/modules/protocol/MySQL/MySQLBackend/mysql_backend.c
rename to server/modules/protocol/MySQL/mariadbbackend/mysql_backend.c
index fbb2251d2..02a428348 100644
--- a/server/modules/protocol/MySQL/MySQLBackend/mysql_backend.c
+++ b/server/modules/protocol/MySQL/mariadbbackend/mysql_backend.c
@@ -11,7 +11,7 @@
  * Public License.
  */
 
-#define MXS_MODULE_NAME "MySQLBackend"
+#define MXS_MODULE_NAME "mariadbbackend"
 
 #include <maxscale/alloc.h>
 #include <maxscale/limits.h>