diff --git a/extensions/guacamole-auth-http/src/main/java/org/apache/guacamole/auth/http/AuthenticationProviderService.java b/extensions/guacamole-auth-http/src/main/java/org/apache/guacamole/auth/http/AuthenticationProviderService.java
index 46bc92900..6aa98dcbf 100644
--- a/extensions/guacamole-auth-http/src/main/java/org/apache/guacamole/auth/http/AuthenticationProviderService.java
+++ b/extensions/guacamole-auth-http/src/main/java/org/apache/guacamole/auth/http/AuthenticationProviderService.java
@@ -38,7 +38,7 @@ import java.security.Principal;
 public class AuthenticationProviderService {
 
     /**
-     * Service for retrieving LDAP server configuration information.
+     * Service for retrieving header configuration information.
      */
     @Inject
     private ConfigurationService confService;
@@ -67,7 +67,7 @@ public class AuthenticationProviderService {
     public AuthenticatedUser authenticateUser(Credentials credentials)
             throws GuacamoleException {
 
-        // Pull HTTP ticket from request if present
+        // Pull HTTP header from request if present
         HttpServletRequest request = credentials.getRequest();
         if (request != null) {
             String username = request.getRemoteUser();
diff --git a/extensions/guacamole-auth-http/src/main/java/org/apache/guacamole/auth/http/ConfigurationService.java b/extensions/guacamole-auth-http/src/main/java/org/apache/guacamole/auth/http/ConfigurationService.java
index c1ee8d87d..59416a98d 100644
--- a/extensions/guacamole-auth-http/src/main/java/org/apache/guacamole/auth/http/ConfigurationService.java
+++ b/extensions/guacamole-auth-http/src/main/java/org/apache/guacamole/auth/http/ConfigurationService.java
@@ -24,7 +24,8 @@ import org.apache.guacamole.GuacamoleException;
 import org.apache.guacamole.environment.Environment;
 
 /**
- * Service for retrieving configuration information regarding the LDAP server.
+ * Service for retrieving configuration information for HTTP header-based 
+ * authentication.
  *
  * @author Nick Couchman
  */
diff --git a/extensions/guacamole-auth-http/src/main/java/org/apache/guacamole/auth/http/HTTPAuthenticationProvider.java b/extensions/guacamole-auth-http/src/main/java/org/apache/guacamole/auth/http/HTTPAuthenticationProvider.java
index fe7edeb80..505f1c5af 100644
--- a/extensions/guacamole-auth-http/src/main/java/org/apache/guacamole/auth/http/HTTPAuthenticationProvider.java
+++ b/extensions/guacamole-auth-http/src/main/java/org/apache/guacamole/auth/http/HTTPAuthenticationProvider.java
@@ -29,7 +29,7 @@ import org.apache.guacamole.net.auth.UserContext;
 
 /**
  * Guacamole authentication backend which authenticates users using an
- * arbitrary external system implementing HTTP. No storage for connections is
+ * arbitrary external HTTP header. No storage for connections is
  * provided - only authentication. Storage must be provided by some other
  * extension.
  *
@@ -45,7 +45,7 @@ public class HTTPAuthenticationProvider implements AuthenticationProvider {
 
     /**
      * Creates a new HTTPAuthenticationProvider that authenticates users
-     * against an HTTP service
+     * using HTTP headers.
      *
      * @throws GuacamoleException
      *     If a required property is missing, or an error occurs while parsing
@@ -69,7 +69,7 @@ public class HTTPAuthenticationProvider implements AuthenticationProvider {
     public AuthenticatedUser authenticateUser(Credentials credentials)
             throws GuacamoleException {
 
-        // Attempt to authenticate user with given credentials
+        // Pass credentials to authentication service.
         AuthenticationProviderService authProviderService = injector.getInstance(AuthenticationProviderService.class);
         return authProviderService.authenticateUser(credentials);
 
diff --git a/extensions/guacamole-auth-http/src/main/java/org/apache/guacamole/auth/http/user/AuthenticatedUser.java b/extensions/guacamole-auth-http/src/main/java/org/apache/guacamole/auth/http/user/AuthenticatedUser.java
index 390d184c1..52a226e82 100644
--- a/extensions/guacamole-auth-http/src/main/java/org/apache/guacamole/auth/http/user/AuthenticatedUser.java
+++ b/extensions/guacamole-auth-http/src/main/java/org/apache/guacamole/auth/http/user/AuthenticatedUser.java
@@ -25,7 +25,7 @@ import org.apache.guacamole.net.auth.AuthenticationProvider;
 import org.apache.guacamole.net.auth.Credentials;
 
 /**
- * An HTTP-specific implementation of AuthenticatedUser, associating a
+ * An HTTP header implementation of AuthenticatedUser, associating a
  * username and particular set of credentials with the HTTP authentication
  * provider.
  *
diff --git a/extensions/guacamole-auth-http/src/main/resources/guac-manifest.json b/extensions/guacamole-auth-http/src/main/resources/guac-manifest.json
index 898234156..0432dc325 100644
--- a/extensions/guacamole-auth-http/src/main/resources/guac-manifest.json
+++ b/extensions/guacamole-auth-http/src/main/resources/guac-manifest.json
@@ -2,7 +2,7 @@
 
     "guacamoleVersion" : "0.9.11-incubating",
 
-    "name"      : "HTTP Authentication Extension",
+    "name"      : "HTTP Header Authentication Extension",
     "namespace" : "guac-http",
 
     "authProviders" : [