diff --git a/include/maxscale/filter.h b/include/maxscale/filter.h
index dbf1582ae..a06f81efb 100644
--- a/include/maxscale/filter.h
+++ b/include/maxscale/filter.h
@@ -61,7 +61,7 @@ typedef void *FILTER;
  *
  * @see load_module
  */
-typedef struct filter_object
+typedef struct mxs_filter_object
 {
     FILTER  *(*createInstance)(const char *name,
                               char **options,
@@ -76,10 +76,10 @@ typedef struct filter_object
     void     (*diagnostics)(FILTER *instance, void *fsession, DCB *dcb);
     uint64_t (*getCapabilities)(void);
     void     (*destroyInstance)(FILTER *instance);
-} FILTER_OBJECT;
+} MXS_FILTER_OBJECT;
 
 /**
- * The filter API version. If the FILTER_OBJECT structure or the filter API
+ * The filter API version. If the MXS_FILTER_OBJECT structure or the filter API
  * is changed these values must be updated in line with the rules in the
  * file modinfo.h.
  */
@@ -96,7 +96,7 @@ typedef struct filter_def
     char **options;                /**< The options set for this filter */
     CONFIG_PARAMETER *parameters; /**< The filter parameters */
     FILTER filter;                 /**< The runtime filter */
-    FILTER_OBJECT *obj;            /**< The "MODULE_OBJECT" for the filter */
+    MXS_FILTER_OBJECT *obj;            /**< The "MODULE_OBJECT" for the filter */
     SPINLOCK spin;                 /**< Spinlock to protect the filter definition */
     struct filter_def *next;       /**< Next filter in the chain of all filters */
 } FILTER_DEF;
diff --git a/include/maxscale/filter.hh b/include/maxscale/filter.hh
index e0d9ba9e1..80952be10 100644
--- a/include/maxscale/filter.hh
+++ b/include/maxscale/filter.hh
@@ -306,12 +306,12 @@ public:
         MXS_EXCEPTION_GUARD(delete pFilter);
     }
 
-    static FILTER_OBJECT s_object;
+    static MXS_FILTER_OBJECT s_object;
 };
 
 
 template<class FilterType, class FilterSessionType>
-FILTER_OBJECT Filter<FilterType, FilterSessionType>::s_object =
+MXS_FILTER_OBJECT Filter<FilterType, FilterSessionType>::s_object =
 {
     &Filter<FilterType, FilterSessionType>::createInstance,
     &Filter<FilterType, FilterSessionType>::newSession,
diff --git a/include/maxscale/modinfo.h b/include/maxscale/modinfo.h
index 7e607d143..da4d3a3ec 100644
--- a/include/maxscale/modinfo.h
+++ b/include/maxscale/modinfo.h
@@ -184,7 +184,7 @@ typedef struct mxs_module
  * MXS_MODULE* MXS_CREATE_MODULE()
  * {
  *     // Module specific API implementation
- *    static FILTER_OBJECT my_object = { ... };
+ *    static MXS_FILTER_OBJECT my_object = { ... };
  *
  *     // An implementation of the MXS_MODULE structure
  *    static MXS_MODULE info = { ... };
diff --git a/server/modules/filter/ccrfilter/ccrfilter.c b/server/modules/filter/ccrfilter/ccrfilter.c
index 5dce3b288..8a895d13b 100644
--- a/server/modules/filter/ccrfilter/ccrfilter.c
+++ b/server/modules/filter/ccrfilter/ccrfilter.c
@@ -101,7 +101,7 @@ typedef struct
  */
 MXS_MODULE* MXS_CREATE_MODULE()
 {
-    static FILTER_OBJECT MyObject =
+    static MXS_FILTER_OBJECT MyObject =
     {
         createInstance,
         newSession,
diff --git a/server/modules/filter/dbfwfilter/dbfwfilter.c b/server/modules/filter/dbfwfilter/dbfwfilter.c
index 8694c2387..f99f6a48d 100644
--- a/server/modules/filter/dbfwfilter/dbfwfilter.c
+++ b/server/modules/filter/dbfwfilter/dbfwfilter.c
@@ -805,7 +805,7 @@ MXS_MODULE* MXS_CREATE_MODULE()
 
     modulecmd_register_command("dbfwfilter", "rules", dbfw_show_rules, 2, args_rules_show);
 
-    static FILTER_OBJECT MyObject =
+    static MXS_FILTER_OBJECT MyObject =
     {
         createInstance,
         newSession,
diff --git a/server/modules/filter/hintfilter/hintfilter.c b/server/modules/filter/hintfilter/hintfilter.c
index 83f1fd3f6..947085e9b 100644
--- a/server/modules/filter/hintfilter/hintfilter.c
+++ b/server/modules/filter/hintfilter/hintfilter.c
@@ -42,7 +42,7 @@ static uint64_t getCapabilities(void);
  */
 MXS_MODULE* MXS_CREATE_MODULE()
 {
-    static FILTER_OBJECT MyObject =
+    static MXS_FILTER_OBJECT MyObject =
     {
         createInstance,
         newSession,
diff --git a/server/modules/filter/luafilter/luafilter.c b/server/modules/filter/luafilter/luafilter.c
index 552dc145f..6fb72aee3 100644
--- a/server/modules/filter/luafilter/luafilter.c
+++ b/server/modules/filter/luafilter/luafilter.c
@@ -74,7 +74,7 @@ static uint64_t getCapabilities(void);
  */
 MXS_MODULE* MXS_CREATE_MODULE()
 {
-    static FILTER_OBJECT MyObject =
+    static MXS_FILTER_OBJECT MyObject =
     {
         createInstance,
         newSession,
diff --git a/server/modules/filter/maxrows/maxrows.c b/server/modules/filter/maxrows/maxrows.c
index 0f343c3a6..6fd9735c2 100644
--- a/server/modules/filter/maxrows/maxrows.c
+++ b/server/modules/filter/maxrows/maxrows.c
@@ -66,7 +66,7 @@ static uint64_t getCapabilities(void);
  */
 MXS_MODULE* MXS_CREATE_MODULE()
 {
-    static FILTER_OBJECT object =
+    static MXS_FILTER_OBJECT object =
     {
         createInstance,
         newSession,
diff --git a/server/modules/filter/mqfilter/mqfilter.c b/server/modules/filter/mqfilter/mqfilter.c
index 25e61c534..a9a75f343 100644
--- a/server/modules/filter/mqfilter/mqfilter.c
+++ b/server/modules/filter/mqfilter/mqfilter.c
@@ -256,7 +256,7 @@ static const MXS_ENUM_VALUE trigger_values[] =
  */
 MXS_MODULE* MXS_CREATE_MODULE()
 {
-    static FILTER_OBJECT MyObject =
+    static MXS_FILTER_OBJECT MyObject =
     {
         createInstance,
         newSession,
diff --git a/server/modules/filter/namedserverfilter/namedserverfilter.c b/server/modules/filter/namedserverfilter/namedserverfilter.c
index a12a97db0..5873db6e5 100644
--- a/server/modules/filter/namedserverfilter/namedserverfilter.c
+++ b/server/modules/filter/namedserverfilter/namedserverfilter.c
@@ -90,7 +90,7 @@ static const MXS_ENUM_VALUE option_values[] =
  */
 MXS_MODULE* MXS_CREATE_MODULE()
 {
-    static FILTER_OBJECT MyObject =
+    static MXS_FILTER_OBJECT MyObject =
     {
         createInstance,
         newSession,
diff --git a/server/modules/filter/qlafilter/qlafilter.c b/server/modules/filter/qlafilter/qlafilter.c
index a14cee34c..e6a6a5ba7 100644
--- a/server/modules/filter/qlafilter/qlafilter.c
+++ b/server/modules/filter/qlafilter/qlafilter.c
@@ -169,7 +169,7 @@ static const MXS_ENUM_VALUE log_data_values[] =
  */
 MXS_MODULE* MXS_CREATE_MODULE()
 {
-    static FILTER_OBJECT MyObject =
+    static MXS_FILTER_OBJECT MyObject =
     {
         createInstance,
         newSession,
diff --git a/server/modules/filter/regexfilter/regexfilter.c b/server/modules/filter/regexfilter/regexfilter.c
index 6a6daae21..c3c2f9c17 100644
--- a/server/modules/filter/regexfilter/regexfilter.c
+++ b/server/modules/filter/regexfilter/regexfilter.c
@@ -99,7 +99,7 @@ static const MXS_ENUM_VALUE option_values[] =
  */
 MXS_MODULE* MXS_CREATE_MODULE()
 {
-    static FILTER_OBJECT MyObject =
+    static MXS_FILTER_OBJECT MyObject =
     {
         createInstance,
         newSession,
diff --git a/server/modules/filter/tee/tee.c b/server/modules/filter/tee/tee.c
index 8d7680ca7..cca16486d 100644
--- a/server/modules/filter/tee/tee.c
+++ b/server/modules/filter/tee/tee.c
@@ -304,7 +304,7 @@ MXS_MODULE* MXS_CREATE_MODULE()
     spinlock_init(&debug_lock);
 #endif
 
-    static FILTER_OBJECT MyObject =
+    static MXS_FILTER_OBJECT MyObject =
     {
         createInstance,
         newSession,
diff --git a/server/modules/filter/testfilter/testfilter.c b/server/modules/filter/testfilter/testfilter.c
index 8a7f48274..865ded07b 100644
--- a/server/modules/filter/testfilter/testfilter.c
+++ b/server/modules/filter/testfilter/testfilter.c
@@ -71,7 +71,7 @@ typedef struct
  */
 MXS_MODULE* MXS_CREATE_MODULE()
 {
-    static FILTER_OBJECT MyObject =
+    static MXS_FILTER_OBJECT MyObject =
     {
         createInstance,
         newSession,
diff --git a/server/modules/filter/topfilter/topfilter.c b/server/modules/filter/topfilter/topfilter.c
index cca64d2d6..bcc5d2972 100644
--- a/server/modules/filter/topfilter/topfilter.c
+++ b/server/modules/filter/topfilter/topfilter.c
@@ -133,7 +133,7 @@ static const MXS_ENUM_VALUE option_values[] =
  */
 MXS_MODULE* MXS_CREATE_MODULE()
 {
-    static FILTER_OBJECT MyObject =
+    static MXS_FILTER_OBJECT MyObject =
     {
         createInstance,
         newSession,
diff --git a/server/modules/filter/tpmfilter/tpmfilter.c b/server/modules/filter/tpmfilter/tpmfilter.c
index e22f2324c..041e71cc7 100644
--- a/server/modules/filter/tpmfilter/tpmfilter.c
+++ b/server/modules/filter/tpmfilter/tpmfilter.c
@@ -143,7 +143,7 @@ typedef struct
  */
 MXS_MODULE* MXS_CREATE_MODULE()
 {
-    static FILTER_OBJECT MyObject =
+    static MXS_FILTER_OBJECT MyObject =
     {
         createInstance,
         newSession,