diff --git a/config b/config
index ea14ebb6..976a3b70 100644
--- a/config
+++ b/config
@@ -47,7 +47,7 @@ stock = utf-8
 
 [auth]
 # Authentication method
-# Value: None | htpasswd | IMAP | LDAP | PAM | courier | http | custom | apache
+# Value: None | htpasswd | IMAP | LDAP | PAM | courier | http | custom | remote_user
 type = None
 
 # custom auth handler
diff --git a/radicale/auth/apache.py b/radicale/auth/remote_user.py
similarity index 90%
rename from radicale/auth/apache.py
rename to radicale/auth/remote_user.py
index 7c3cf161..d61c26c4 100644
--- a/radicale/auth/apache.py
+++ b/radicale/auth/remote_user.py
@@ -18,7 +18,7 @@
 # along with Radicale.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-Trusting apache auth mechanism.
+Trusting the HTTP server auth mechanism.
 """
 
 from .. import log
@@ -26,5 +26,5 @@ from .. import log
 
 def is_authenticated(user, password):
     """Check if ``user`` is defined and assuming it's valid."""
-    log.LOGGER.debug('Got user %r from apache.' % user)
+    log.LOGGER.debug('Got user %r from HTTP server.' % user)
     return user is not None