diff --git a/server/modules/monitor/CMakeLists.txt b/server/modules/monitor/CMakeLists.txt
index 5312e66b0..ea9c027a3 100644
--- a/server/modules/monitor/CMakeLists.txt
+++ b/server/modules/monitor/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_subdirectory(auroramon)
-add_subdirectory(clustrixmon)
 add_subdirectory(csmon)
 add_subdirectory(galeramon)
 add_subdirectory(grmon)
 add_subdirectory(mariadbmon)
+add_subdirectory(xpandmon)
diff --git a/server/modules/monitor/clustrixmon/CMakeLists.txt b/server/modules/monitor/clustrixmon/CMakeLists.txt
deleted file mode 100644
index d15178586..000000000
--- a/server/modules/monitor/clustrixmon/CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-add_library(clustrixmon SHARED
-  clustrix.cc
-  clustrixmon.cc
-  clustrixmonitor.cc
-  clustrixnode.cc
-  )
-target_link_libraries(clustrixmon maxscale-common)
-set_target_properties(clustrixmon PROPERTIES VERSION "1.0.0" LINK_FLAGS -Wl,-z,defs)
-install_module(clustrixmon core)
diff --git a/server/modules/monitor/xpandmon/CMakeLists.txt b/server/modules/monitor/xpandmon/CMakeLists.txt
new file mode 100644
index 000000000..d22c45476
--- /dev/null
+++ b/server/modules/monitor/xpandmon/CMakeLists.txt
@@ -0,0 +1,9 @@
+add_library(xpandmon SHARED
+  xpand.cc
+  xpandmon.cc
+  xpandmonitor.cc
+  xpandnode.cc
+  )
+target_link_libraries(xpandmon maxscale-common)
+set_target_properties(xpandmon PROPERTIES VERSION "1.0.0" LINK_FLAGS -Wl,-z,defs)
+install_module(xpandmon core)
diff --git a/server/modules/monitor/clustrixmon/clustrix.cc b/server/modules/monitor/xpandmon/xpand.cc
similarity index 99%
rename from server/modules/monitor/clustrixmon/clustrix.cc
rename to server/modules/monitor/xpandmon/xpand.cc
index 5acb461b9..9d4cffe7b 100644
--- a/server/modules/monitor/clustrixmon/clustrix.cc
+++ b/server/modules/monitor/xpandmon/xpand.cc
@@ -11,7 +11,7 @@
  * Public License.
  */
 
-#include "clustrix.hh"
+#include "xpand.hh"
 #include <maxbase/assert.h>
 
 using maxscale::Monitor;
diff --git a/server/modules/monitor/clustrixmon/clustrix.hh b/server/modules/monitor/xpandmon/xpand.hh
similarity index 99%
rename from server/modules/monitor/clustrixmon/clustrix.hh
rename to server/modules/monitor/xpandmon/xpand.hh
index a6e351b5d..1aa859457 100644
--- a/server/modules/monitor/clustrixmon/clustrix.hh
+++ b/server/modules/monitor/xpandmon/xpand.hh
@@ -12,7 +12,7 @@
  */
 #pragma once
 
-#include "clustrixmon.hh"
+#include "xpandmon.hh"
 #include <string>
 #include <maxscale/monitor.hh>
 #include <maxscale/server.hh>
diff --git a/server/modules/monitor/clustrixmon/clustrixmembership.hh b/server/modules/monitor/xpandmon/xpandmembership.hh
similarity index 97%
rename from server/modules/monitor/clustrixmon/clustrixmembership.hh
rename to server/modules/monitor/xpandmon/xpandmembership.hh
index fd3e3225b..b18d818cf 100644
--- a/server/modules/monitor/clustrixmon/clustrixmembership.hh
+++ b/server/modules/monitor/xpandmon/xpandmembership.hh
@@ -12,11 +12,11 @@
  */
 #pragma once
 
-#include "clustrixmon.hh"
+#include "xpandmon.hh"
 #include <iostream>
 #include <sstream>
 #include <string>
-#include "clustrix.hh"
+#include "xpand.hh"
 
 class ClustrixMembership
 {
diff --git a/server/modules/monitor/clustrixmon/clustrixmon.cc b/server/modules/monitor/xpandmon/xpandmon.cc
similarity index 98%
rename from server/modules/monitor/clustrixmon/clustrixmon.cc
rename to server/modules/monitor/xpandmon/xpandmon.cc
index 126b94c9c..51e12def2 100644
--- a/server/modules/monitor/clustrixmon/clustrixmon.cc
+++ b/server/modules/monitor/xpandmon/xpandmon.cc
@@ -11,10 +11,10 @@
  * Public License.
  */
 
-#include "clustrixmon.hh"
+#include "xpandmon.hh"
 #include <maxscale/modinfo.h>
 #include <maxscale/modulecmd.hh>
-#include "clustrixmonitor.hh"
+#include "xpandmonitor.hh"
 
 namespace
 {
diff --git a/server/modules/monitor/clustrixmon/clustrixmon.hh b/server/modules/monitor/xpandmon/xpandmon.hh
similarity index 94%
rename from server/modules/monitor/clustrixmon/clustrixmon.hh
rename to server/modules/monitor/xpandmon/xpandmon.hh
index 06e660f6e..03f80b862 100644
--- a/server/modules/monitor/clustrixmon/clustrixmon.hh
+++ b/server/modules/monitor/xpandmon/xpandmon.hh
@@ -12,7 +12,7 @@
  */
 #pragma once
 
-#define MXS_MODULE_NAME "clustrixmon"
+#define MXS_MODULE_NAME "xpandmon"
 
 #include <maxscale/ccdefs.hh>
 #include <maxbase/log.hh>
diff --git a/server/modules/monitor/clustrixmon/clustrixmonitor.cc b/server/modules/monitor/xpandmon/xpandmonitor.cc
similarity index 99%
rename from server/modules/monitor/clustrixmon/clustrixmonitor.cc
rename to server/modules/monitor/xpandmon/xpandmonitor.cc
index 241840a87..495587e5a 100644
--- a/server/modules/monitor/clustrixmon/clustrixmonitor.cc
+++ b/server/modules/monitor/xpandmon/xpandmonitor.cc
@@ -11,7 +11,7 @@
  * Public License.
  */
 
-#include "clustrixmonitor.hh"
+#include "xpandmonitor.hh"
 #include <algorithm>
 #include <set>
 #include <maxbase/string.hh>
diff --git a/server/modules/monitor/clustrixmon/clustrixmonitor.hh b/server/modules/monitor/xpandmon/xpandmonitor.hh
similarity index 98%
rename from server/modules/monitor/clustrixmon/clustrixmonitor.hh
rename to server/modules/monitor/xpandmon/xpandmonitor.hh
index 6d3390be3..d3c7a2e48 100644
--- a/server/modules/monitor/clustrixmon/clustrixmonitor.hh
+++ b/server/modules/monitor/xpandmon/xpandmonitor.hh
@@ -12,15 +12,15 @@
  */
 #pragma once
 
-#include "clustrixmon.hh"
+#include "xpandmon.hh"
 #include <map>
 #include <set>
 #include <sqlite3.h>
 #include <maxscale/config2.hh>
 #include <maxscale/monitor.hh>
 #include <maxbase/http.hh>
-#include "clustrixmembership.hh"
-#include "clustrixnode.hh"
+#include "xpandmembership.hh"
+#include "xpandnode.hh"
 
 class ClustrixMonitor : public maxscale::MonitorWorker
                       , private ClustrixNode::Persister
diff --git a/server/modules/monitor/clustrixmon/clustrixnode.cc b/server/modules/monitor/xpandmon/xpandnode.cc
similarity index 94%
rename from server/modules/monitor/clustrixmon/clustrixnode.cc
rename to server/modules/monitor/xpandmon/xpandnode.cc
index 2ebffbbac..9741b5783 100644
--- a/server/modules/monitor/clustrixmon/clustrixnode.cc
+++ b/server/modules/monitor/xpandmon/xpandnode.cc
@@ -11,8 +11,8 @@
  * Public License.
  */
 
-#include "clustrixnode.hh"
-#include "clustrix.hh"
+#include "xpandnode.hh"
+#include "xpand.hh"
 
 bool ClustrixNode::can_be_used_as_hub(const char* zName,
                                       const mxs::MonitorServer::ConnectionSettings& settings,
diff --git a/server/modules/monitor/clustrixmon/clustrixnode.hh b/server/modules/monitor/xpandmon/xpandnode.hh
similarity index 98%
rename from server/modules/monitor/clustrixmon/clustrixnode.hh
rename to server/modules/monitor/xpandmon/xpandnode.hh
index 69dd7c676..d22f32faa 100644
--- a/server/modules/monitor/clustrixmon/clustrixnode.hh
+++ b/server/modules/monitor/xpandmon/xpandnode.hh
@@ -12,12 +12,12 @@
  */
 #pragma once
 
-#include "clustrixmon.hh"
+#include "xpandmon.hh"
 #include <iostream>
 #include <sstream>
 #include <string>
-#include "clustrix.hh"
-#include "clustrixmembership.hh"
+#include "xpand.hh"
+#include "xpandmembership.hh"
 
 class ClustrixNode
 {