diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/token/StandardTokens.java b/guacamole-ext/src/main/java/org/apache/guacamole/token/StandardTokens.java
index 0dd4aed03..090231029 100644
--- a/guacamole-ext/src/main/java/org/apache/guacamole/token/StandardTokens.java
+++ b/guacamole-ext/src/main/java/org/apache/guacamole/token/StandardTokens.java
@@ -45,12 +45,12 @@ public class StandardTokens {
     /**
      * The name of the client token added via addStandardTokens().
      */
-    public static final String CLIENT_HOST_TOKEN = "GUAC_CLIENT_HOST";
+    public static final String CLIENT_HOST_TOKEN = "GUAC_REMHOST";
 
     /**
      * The IP of the client token added via addStandardTokens().
      */
-    public static final String CLIENT_IP_TOKEN = "GUAC_CLIENT_IP";
+    public static final String CLIENT_IP_TOKEN = "GUAC_REMIP";
 
     /**
      * The name of the date token (server-local time) added via