diff --git a/guacamole/src/main/java/org/apache/guacamole/auth/file/FileAuthenticationProvider.java b/guacamole/src/main/java/org/apache/guacamole/auth/file/FileAuthenticationProvider.java
index 75230fd82..13ebe6200 100644
--- a/guacamole/src/main/java/org/apache/guacamole/auth/file/FileAuthenticationProvider.java
+++ b/guacamole/src/main/java/org/apache/guacamole/auth/file/FileAuthenticationProvider.java
@@ -94,8 +94,8 @@ public class FileAuthenticationProvider extends SimpleAuthenticationProvider {
     public static final String USER_MAPPING_FILENAME = "user-mapping.xml";
     
     /**
-     * Creates a new BasicFileAuthenticationProvider that authenticates users
-     * against simple, monolithic XML file.
+     * Creates a new FileAuthenticationProvider that authenticates users against
+     * simple, monolithic XML file.
      *
      * @throws GuacamoleException
      *     If a required property is missing, or an error occurs while parsing
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/auth/HashTokenSessionMap.java b/guacamole/src/main/java/org/apache/guacamole/rest/auth/HashTokenSessionMap.java
index a362c691e..5c5f46f4f 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/auth/HashTokenSessionMap.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/auth/HashTokenSessionMap.java
@@ -72,8 +72,7 @@ public class HashTokenSessionMap implements TokenSessionMap {
     };
 
     /**
-     * Create a new BasicTokenGuacamoleSessionMap configured using the given
-     * environment.
+     * Create a new HashTokenSessionMap configured using the given environment.
      *
      * @param environment
      *     The environment to use when configuring the token session map.
diff --git a/guacamole/src/main/java/org/apache/guacamole/tunnel/TunnelModule.java b/guacamole/src/main/java/org/apache/guacamole/tunnel/TunnelModule.java
index 331184fdc..12f3b749b 100644
--- a/guacamole/src/main/java/org/apache/guacamole/tunnel/TunnelModule.java
+++ b/guacamole/src/main/java/org/apache/guacamole/tunnel/TunnelModule.java
@@ -44,10 +44,10 @@ public class TunnelModule extends ServletModule {
      * Classnames of all implementation-specific WebSocket tunnel modules.
      */
     private static final String[] WEBSOCKET_MODULES = {
-        "org.apache.guacamole.websocket.WebSocketTunnelModule",
-        "org.apache.guacamole.websocket.jetty8.WebSocketTunnelModule",
-        "org.apache.guacamole.websocket.jetty9.WebSocketTunnelModule",
-        "org.apache.guacamole.websocket.tomcat.WebSocketTunnelModule"
+        "org.apache.guacamole.tunnel.websocket.WebSocketTunnelModule",
+        "org.apache.guacamole.tunnel.websocket.jetty8.WebSocketTunnelModule",
+        "org.apache.guacamole.tunnel.websocket.jetty9.WebSocketTunnelModule",
+        "org.apache.guacamole.tunnel.websocket.tomcat.WebSocketTunnelModule"
     };
 
     private boolean loadWebSocketModule(String classname) {
diff --git a/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/RestrictedGuacamoleWebSocketTunnelEndpoint.java b/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/RestrictedGuacamoleWebSocketTunnelEndpoint.java
index 09b7487d7..5e5560f27 100644
--- a/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/RestrictedGuacamoleWebSocketTunnelEndpoint.java
+++ b/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/RestrictedGuacamoleWebSocketTunnelEndpoint.java
@@ -34,7 +34,6 @@ import org.apache.guacamole.net.GuacamoleTunnel;
 import org.apache.guacamole.tunnel.TunnelRequest;
 import org.apache.guacamole.tunnel.TunnelRequestService;
 import org.apache.guacamole.websocket.GuacamoleWebSocketTunnelEndpoint;
-import org.apache.guacamole.websocket.GuacamoleWebSocketTunnelEndpoint;
 
 /**
  * Tunnel implementation which uses WebSocket as a tunnel backend, rather than
diff --git a/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/jetty8/WebSocketTunnelModule.java b/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/jetty8/WebSocketTunnelModule.java
index 79a09db8c..d5d45bd4e 100644
--- a/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/jetty8/WebSocketTunnelModule.java
+++ b/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/jetty8/WebSocketTunnelModule.java
@@ -45,7 +45,7 @@ public class WebSocketTunnelModule extends ServletModule implements TunnelLoader
         try {
 
             // Attempt to find WebSocket servlet
-            Class.forName("org.apache.guacamole.websocket.jetty8.BasicGuacamoleWebSocketTunnelServlet");
+            Class.forName("org.apache.guacamole.tunnel.websocket.jetty8.RestrictedGuacamoleWebSocketTunnelServlet");
 
             // Support found
             return true;
diff --git a/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/jetty9/WebSocketTunnelModule.java b/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/jetty9/WebSocketTunnelModule.java
index 3477894e5..9def8e638 100644
--- a/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/jetty9/WebSocketTunnelModule.java
+++ b/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/jetty9/WebSocketTunnelModule.java
@@ -45,7 +45,7 @@ public class WebSocketTunnelModule extends ServletModule implements TunnelLoader
         try {
 
             // Attempt to find WebSocket servlet
-            Class.forName("org.apache.guacamole.websocket.jetty9.BasicGuacamoleWebSocketTunnelServlet");
+            Class.forName("org.apache.guacamole.tunnel.websocket.jetty9.RestrictedGuacamoleWebSocketTunnelServlet");
 
             // Support found
             return true;
diff --git a/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/tomcat/WebSocketTunnelModule.java b/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/tomcat/WebSocketTunnelModule.java
index 1b553b91a..650522ee8 100644
--- a/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/tomcat/WebSocketTunnelModule.java
+++ b/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/tomcat/WebSocketTunnelModule.java
@@ -45,7 +45,7 @@ public class WebSocketTunnelModule extends ServletModule implements TunnelLoader
         try {
 
             // Attempt to find WebSocket servlet
-            Class.forName("org.apache.guacamole.websocket.tomcat.BasicGuacamoleWebSocketTunnelServlet");
+            Class.forName("org.apache.guacamole.tunnel.websocket.tomcat.RestrictedGuacamoleWebSocketTunnelServlet");
 
             // Support found
             return true;