diff --git a/Documentation/Authenticators/Authentication-Modules.md b/Documentation/Authenticators/Authentication-Modules.md
index 291e9030c..b8f953c07 100644
--- a/Documentation/Authenticators/Authentication-Modules.md
+++ b/Documentation/Authenticators/Authentication-Modules.md
@@ -4,7 +4,7 @@ This document describes the modular authentication in MaxScale. It contains
 protocol specific information on authentication and how it is handled in
 MaxScale.
 
-The constants described in this document are defined in the gw_authenticator.h
+The constants described in this document are defined in the authenticator.h
 header unless otherwise mentioned.
 
 ## Authenticator initialization
diff --git a/include/maxscale/authenticator.h b/include/maxscale/authenticator.h
index b76ea0c59..3c290ca9e 100644
--- a/include/maxscale/authenticator.h
+++ b/include/maxscale/authenticator.h
@@ -13,7 +13,7 @@
  */
 
 /**
- * @file gw_authenticator.h
+ * @file authenticator.h
  *
  * The authenticator module interface definitions for MaxScale
  *
diff --git a/server/modules/authenticator/CDCPlainAuth/cdc_plain_auth.c b/server/modules/authenticator/CDCPlainAuth/cdc_plain_auth.c
index 681547831..989d21b0e 100644
--- a/server/modules/authenticator/CDCPlainAuth/cdc_plain_auth.c
+++ b/server/modules/authenticator/CDCPlainAuth/cdc_plain_auth.c
@@ -27,7 +27,7 @@
 
 #define MXS_MODULE_NAME "CDCPlainAuth"
 
-#include <maxscale/gw_authenticator.h>
+#include <maxscale/authenticator.h>
 #include <sys/stat.h>
 #include <cdc.h>
 #include <maxscale/alloc.h>
diff --git a/server/modules/authenticator/GSSAPI/GSSAPIAuth/gssapi_auth.c b/server/modules/authenticator/GSSAPI/GSSAPIAuth/gssapi_auth.c
index ff055c669..ba45e1e6e 100644
--- a/server/modules/authenticator/GSSAPI/GSSAPIAuth/gssapi_auth.c
+++ b/server/modules/authenticator/GSSAPI/GSSAPIAuth/gssapi_auth.c
@@ -13,7 +13,7 @@
 
 #define MXS_MODULE_NAME "GSSAPIAuth"
 
-#include <maxscale/gw_authenticator.h>
+#include <maxscale/authenticator.h>
 #include <maxscale/alloc.h>
 #include <maxscale/dcb.h>
 #include <maxscale/log_manager.h>
diff --git a/server/modules/authenticator/GSSAPI/GSSAPIBackendAuth/gssapi_backend_auth.c b/server/modules/authenticator/GSSAPI/GSSAPIBackendAuth/gssapi_backend_auth.c
index 0abae6cb1..46bae2409 100644
--- a/server/modules/authenticator/GSSAPI/GSSAPIBackendAuth/gssapi_backend_auth.c
+++ b/server/modules/authenticator/GSSAPI/GSSAPIBackendAuth/gssapi_backend_auth.c
@@ -13,7 +13,7 @@
 
 #define MXS_MODULE_NAME "GSSAPIBackendAuth"
 
-#include <maxscale/gw_authenticator.h>
+#include <maxscale/authenticator.h>
 #include <maxscale/alloc.h>
 #include <maxscale/dcb.h>
 #include <maxscale/log_manager.h>
diff --git a/server/modules/authenticator/MySQLBackendAuth/mysql_backend_auth.c b/server/modules/authenticator/MySQLBackendAuth/mysql_backend_auth.c
index b1cef66a4..f73d92de8 100644
--- a/server/modules/authenticator/MySQLBackendAuth/mysql_backend_auth.c
+++ b/server/modules/authenticator/MySQLBackendAuth/mysql_backend_auth.c
@@ -83,7 +83,7 @@ void auth_backend_destroy(void *data)
  * @param dcb Request handler DCB connected to the client
  * @param buffer Buffer containing data from client
  * @return Authentication status
- * @see gw_quthenticator.h
+ * @see authenticator.h
  * @see https://dev.mysql.com/doc/internals/en/client-server-protocol.html
  */
 static int auth_backend_extract(DCB *dcb, GWBUF *buf)
@@ -119,7 +119,7 @@ static int auth_backend_extract(DCB *dcb, GWBUF *buf)
  *
  * @param dcb Backend DCB
  * @return Authentication status
- * @see gw_authenticator.h
+ * @see authenticator.h
  */
 static int auth_backend_authenticate(DCB *dcb)
 {