diff --git a/server/core/CMakeLists.txt b/server/core/CMakeLists.txt
index e60734237..88f6a9c22 100644
--- a/server/core/CMakeLists.txt
+++ b/server/core/CMakeLists.txt
@@ -1,5 +1,5 @@
 if(BUILD_TESTS OR BUILD_TOOLS)
-  add_library(fullcore STATIC adminusers.c atomic.c config.c buffer.c dbusers.c dcb.c filter.c gwbitmask.c gw_utils.c hashtable.c hint.c housekeeper.c load_utils.c memlog.c modutil.c monitor.c poll.c resultset.c secrets.c server.c service.c session.c spinlock.c thread.c users.c utils.c mon_exec.c)
+  add_library(fullcore STATIC adminusers.c atomic.c config.c buffer.c dbusers.c dcb.c filter.c gwbitmask.c gw_utils.c hashtable.c hint.c housekeeper.c load_utils.c memlog.c modutil.c monitor.c poll.c resultset.c secrets.c server.c service.c session.c spinlock.c thread.c users.c utils.c externcmd.c)
   if(WITH_JEMALLOC)
     target_link_libraries(fullcore ${JEMALLOC_LIBRARIES})
   elseif(WITH_TCMALLOC)
@@ -12,7 +12,7 @@ add_executable(maxscale atomic.c buffer.c spinlock.c gateway.c
 	gw_utils.c utils.c dcb.c load_utils.c session.c service.c server.c 
 	poll.c config.c users.c hashtable.c dbusers.c thread.c gwbitmask.c 
 	monitor.c adminusers.c secrets.c filter.c modutil.c hint.c
-	housekeeper.c memlog.c resultset.c  mon_exec.c)
+	housekeeper.c memlog.c resultset.c  externcmd.c)
 
 if(WITH_JEMALLOC)
   target_link_libraries(maxscale ${JEMALLOC_LIBRARIES})
diff --git a/server/core/mon_exec.c b/server/core/externcmd.c
similarity index 99%
rename from server/core/mon_exec.c
rename to server/core/externcmd.c
index 01640bcd6..09c5727c4 100644
--- a/server/core/mon_exec.c
+++ b/server/core/externcmd.c
@@ -1,4 +1,4 @@
-#include <mon_exec.h>
+#include <externcmd.h>
 
 /** Defined in log_manager.cc */
 extern int            lm_enabled_logfiles_bitmask;
diff --git a/server/include/mon_exec.h b/server/include/externcmd.h
similarity index 91%
rename from server/include/mon_exec.h
rename to server/include/externcmd.h
index 25390bb82..1ab44f908 100644
--- a/server/include/mon_exec.h
+++ b/server/include/externcmd.h
@@ -1,5 +1,5 @@
-#ifndef MON_EXEC_HG
-#define MON_EXEC_HG
+#ifndef _EXTERN_CMD_HG
+#define _EXTERN_CMD_HG
 
 #include <unistd.h>
 #include <string.h>
diff --git a/server/modules/monitor/galeramon.h b/server/modules/monitor/galeramon.h
index 02d8f08c7..7838f05a1 100644
--- a/server/modules/monitor/galeramon.h
+++ b/server/modules/monitor/galeramon.h
@@ -24,7 +24,7 @@
 #include <monitor.h>
 #include <monitor_common.h>
 #include <spinlock.h>
-#include <mon_exec.h>
+#include <externcmd.h>
 #include <thread.h>
 #include <mysql.h>
 #include <mysqld_error.h>
diff --git a/server/modules/monitor/mmmon.h b/server/modules/monitor/mmmon.h
index e2532d407..8a9edfb56 100644
--- a/server/modules/monitor/mmmon.h
+++ b/server/modules/monitor/mmmon.h
@@ -32,7 +32,7 @@
 #include <modinfo.h>
 #include <maxconfig.h>
 #include <monitor_common.h>
-#include <mon_exec.h>
+#include <externcmd.h>
 
 /**
  * The handle for an instance of a Multi-Master Monitor module
diff --git a/server/modules/monitor/mysqlmon.h b/server/modules/monitor/mysqlmon.h
index 574ae7c88..0510a13cf 100644
--- a/server/modules/monitor/mysqlmon.h
+++ b/server/modules/monitor/mysqlmon.h
@@ -32,7 +32,7 @@
 #include <modinfo.h>
 #include <maxconfig.h>
 #include <monitor_common.h>
-#include <mon_exec.h>
+#include <externcmd.h>
 /**
  * @file mysqlmon.h - The MySQL monitor functionality within the gateway
  *
diff --git a/server/modules/monitor/ndbclustermon.h b/server/modules/monitor/ndbclustermon.h
index 081f5e3da..56b961c45 100644
--- a/server/modules/monitor/ndbclustermon.h
+++ b/server/modules/monitor/ndbclustermon.h
@@ -32,7 +32,7 @@
 #include <modinfo.h>
 #include <maxconfig.h>
 #include <monitor_common.h>
-#include <mon_exec.h>
+#include <externcmd.h>
 
 /**
  * @file ndbclustermon.h - The NDB Cluster monitor