diff --git a/guacamole/doc/example/guacamole.properties b/guacamole/doc/example/guacamole.properties
index b7524a330..a7798ff01 100644
--- a/guacamole/doc/example/guacamole.properties
+++ b/guacamole/doc/example/guacamole.properties
@@ -20,8 +20,8 @@
 guacd-hostname: localhost
 guacd-port:     4822
 
-# Session provider class (provides and configured guacamole session based on authentication information)
-session-provider: net.sourceforge.guacamole.net.authentication.basic.BasicGuacamoleSessionProvider
+# Client provider class (provides and configures a guacamole client based on authentication information)
+client-provider: net.sourceforge.guacamole.net.authentication.basic.BasicGuacamoleClientProvider
 
 # Auth provider class (authenticates user/pass combination, needed if using the provided login screen)
 auth-provider: net.sourceforge.guacamole.net.authentication.basic.BasicFileAuthenticationProvider
diff --git a/guacamole/doc/example/user-mapping.xml b/guacamole/doc/example/user-mapping.xml
index 3c2421e2e..6406d7e32 100644
--- a/guacamole/doc/example/user-mapping.xml
+++ b/guacamole/doc/example/user-mapping.xml
@@ -3,9 +3,9 @@
 	<!-- Per-user authentication and config information -->
 	<authorize username="USERNAME" password="PASSWORD">
 		<protocol>vnc</protocol>
-		<hostname>localhost</hostname>
-		<port>5900</port>
-		<password>VNCPASS</password>
+		<param name="hostname">localhost</param>
+		<param name="port">5900</param>
+		<param name="password">VNCPASS</param>
 	</authorize>
 
     <!-- Another user, but using md5 to hash the password
@@ -15,9 +15,9 @@
             password="319f4d26e3c536b5dd871bb2c52e3178"
             encoding="md5">
 		<protocol>vnc</protocol>
-		<hostname>localhost</hostname>
-		<port>5901</port>
-		<password>VNCPASS</password>
+		<param name="hostname">localhost</param>
+		<param name="port">5901</param>
+		<param name="password">VNCPASS</param>
 	</authorize>
 
 </user-mapping>