diff --git a/guacamole-common/src/main/java/net/sourceforge/guacamole/protocol/ConfiguredSocket.java b/guacamole-common/src/main/java/net/sourceforge/guacamole/protocol/ConfiguredGuacamoleSocket.java
similarity index 93%
rename from guacamole-common/src/main/java/net/sourceforge/guacamole/protocol/ConfiguredSocket.java
rename to guacamole-common/src/main/java/net/sourceforge/guacamole/protocol/ConfiguredGuacamoleSocket.java
index 594c20f8d..f177b083e 100644
--- a/guacamole-common/src/main/java/net/sourceforge/guacamole/protocol/ConfiguredSocket.java
+++ b/guacamole-common/src/main/java/net/sourceforge/guacamole/protocol/ConfiguredGuacamoleSocket.java
@@ -25,11 +25,11 @@ import net.sourceforge.guacamole.protocol.GuacamoleInstruction.Operation;
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-public class ConfiguredSocket implements GuacamoleSocket {
+public class ConfiguredGuacamoleSocket implements GuacamoleSocket {
 
     private GuacamoleSocket socket;
 
-    public ConfiguredSocket(GuacamoleSocket socket, Configuration config) throws GuacamoleException {
+    public ConfiguredGuacamoleSocket(GuacamoleSocket socket, GuacamoleConfiguration config) throws GuacamoleException {
 
         this.socket = socket;
 
diff --git a/guacamole-common/src/main/java/net/sourceforge/guacamole/protocol/Configuration.java b/guacamole-common/src/main/java/net/sourceforge/guacamole/protocol/GuacamoleConfiguration.java
similarity index 97%
rename from guacamole-common/src/main/java/net/sourceforge/guacamole/protocol/Configuration.java
rename to guacamole-common/src/main/java/net/sourceforge/guacamole/protocol/GuacamoleConfiguration.java
index 7e4362590..690887ae9 100644
--- a/guacamole-common/src/main/java/net/sourceforge/guacamole/protocol/Configuration.java
+++ b/guacamole-common/src/main/java/net/sourceforge/guacamole/protocol/GuacamoleConfiguration.java
@@ -21,7 +21,7 @@ import java.util.HashMap;
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-public class Configuration {
+public class GuacamoleConfiguration {
 
     private String protocol;
     private HashMap<String, String> parameters = new HashMap<String, String>();