diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/RESTServiceModule.java b/guacamole/src/main/java/org/apache/guacamole/rest/RESTServiceModule.java
index 88551b353..a94f83642 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/RESTServiceModule.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/RESTServiceModule.java
@@ -20,7 +20,7 @@
 package org.apache.guacamole.rest;
 
 import org.apache.guacamole.rest.session.UserContextResourceFactory;
-import org.apache.guacamole.rest.session.SessionResource;
+import org.apache.guacamole.rest.session.SessionDataRESTService;
 import com.google.inject.Scopes;
 import com.google.inject.assistedinject.FactoryModuleBuilder;
 import com.google.inject.matcher.Matchers;
@@ -92,7 +92,7 @@ public class RESTServiceModule extends ServletModule {
         bind(TunnelRESTService.class);
 
         // Root-level resources
-        bind(SessionResource.class);
+        bind(SessionDataRESTService.class);
         install(new FactoryModuleBuilder().build(UserContextResourceFactory.class));
 
         // Resources below root
diff --git a/guacamole/src/main/java/org/apache/guacamole/rest/session/SessionResource.java b/guacamole/src/main/java/org/apache/guacamole/rest/session/SessionDataRESTService.java
similarity index 95%
rename from guacamole/src/main/java/org/apache/guacamole/rest/session/SessionResource.java
rename to guacamole/src/main/java/org/apache/guacamole/rest/session/SessionDataRESTService.java
index 7c98a650c..e21eaa41a 100644
--- a/guacamole/src/main/java/org/apache/guacamole/rest/session/SessionResource.java
+++ b/guacamole/src/main/java/org/apache/guacamole/rest/session/SessionDataRESTService.java
@@ -33,15 +33,15 @@ import org.apache.guacamole.rest.ObjectRetrievalService;
 import org.apache.guacamole.rest.auth.AuthenticationService;
 
 /**
- * A REST resource which exposes all UserContexts within a Guacamole user's
- * session.
+ * A REST service which exposes all data associated with a Guacamole user's
+ * session via the underlying UserContexts.
  *
- * @author mjumper
+ * @author Michael Jumper
  */
 @Path("/data")
 @Produces(MediaType.APPLICATION_JSON)
 @Consumes(MediaType.APPLICATION_JSON)
-public class SessionResource {
+public class SessionDataRESTService {
 
     /**
      * A service for authenticating users from auth tokens.