diff --git a/guacamole-common/src/main/java/net/sourceforge/guacamole/servlet/GuacamoleTunnelServlet.java b/guacamole-common/src/main/java/net/sourceforge/guacamole/servlet/GuacamoleHTTPTunnelServlet.java
similarity index 98%
rename from guacamole-common/src/main/java/net/sourceforge/guacamole/servlet/GuacamoleTunnelServlet.java
rename to guacamole-common/src/main/java/net/sourceforge/guacamole/servlet/GuacamoleHTTPTunnelServlet.java
index 0d735d17e..464b3fc60 100644
--- a/guacamole-common/src/main/java/net/sourceforge/guacamole/servlet/GuacamoleTunnelServlet.java
+++ b/guacamole-common/src/main/java/net/sourceforge/guacamole/servlet/GuacamoleHTTPTunnelServlet.java
@@ -53,13 +53,13 @@ import org.slf4j.LoggerFactory;
 
 /**
  * A HttpServlet implementing and abstracting the operations required by the
- * JavaScript Guacamole client's tunnel.
+ * HTTP implementation of the JavaScript Guacamole client's tunnel.
  *
  * @author Michael Jumper
  */
-public abstract class GuacamoleTunnelServlet extends HttpServlet {
+public abstract class GuacamoleHTTPTunnelServlet extends HttpServlet {
 
-    private Logger logger = LoggerFactory.getLogger(GuacamoleTunnelServlet.class);
+    private Logger logger = LoggerFactory.getLogger(GuacamoleHTTPTunnelServlet.class);
     
     @Override
     protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException {