diff --git a/guacamole/pom.xml b/guacamole/pom.xml
index 72e019ae4..66c1e941f 100644
--- a/guacamole/pom.xml
+++ b/guacamole/pom.xml
@@ -3,10 +3,10 @@
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>net.sourceforge.guacamole</groupId>
-    <artifactId>guacamole-default-webapp</artifactId>
+    <artifactId>guacamole</artifactId>
     <packaging>war</packaging>
     <version>0.6.0</version>
-    <name>guacamole-default-webapp</name>
+    <name>guacamole</name>
     <url>http://guacamole.sourceforge.net/</url>
 
     <properties>
@@ -87,7 +87,7 @@
         <!-- Guacamole Authentication API -->
         <dependency>
             <groupId>net.sourceforge.guacamole</groupId>
-            <artifactId>guacamole-common-auth</artifactId>
+            <artifactId>guacamole-auth</artifactId>
             <version>0.6.0</version>
         </dependency>
 
diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/BasicFileAuthenticationProvider.java b/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/BasicFileAuthenticationProvider.java
index 3f14763bd..316f09355 100644
--- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/BasicFileAuthenticationProvider.java
+++ b/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/BasicFileAuthenticationProvider.java
@@ -31,7 +31,7 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import net.sourceforge.guacamole.GuacamoleException;
-import net.sourceforge.guacamole.net.auth.UsernamePassword;
+import net.sourceforge.guacamole.net.auth.Credentials;
 import net.sourceforge.guacamole.properties.FileGuacamoleProperty;
 import net.sourceforge.guacamole.properties.GuacamoleProperties;
 import net.sourceforge.guacamole.protocol.GuacamoleConfiguration;
@@ -51,7 +51,7 @@ import org.xml.sax.helpers.XMLReaderFactory;
  * 
  * @author Michael Jumper
  */
-public class BasicFileAuthenticationProvider implements AuthenticationProvider<UsernamePassword> {
+public class BasicFileAuthenticationProvider implements AuthenticationProvider {
 
     private Logger logger = LoggerFactory.getLogger(BasicFileAuthenticationProvider.class);
     
@@ -113,7 +113,7 @@ public class BasicFileAuthenticationProvider implements AuthenticationProvider<U
     }
 
     @Override
-    public Map<String, GuacamoleConfiguration> getAuthorizedConfigurations(UsernamePassword credentials) throws GuacamoleException {
+    public Map<String, GuacamoleConfiguration> getAuthorizedConfigurations(Credentials credentials) throws GuacamoleException {
 
         // Check mapping file mod time
         File userMappingFile = getUserMappingFile();
diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/BasicLogin.java b/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/BasicLogin.java
index f7b83555f..e3714a48a 100644
--- a/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/BasicLogin.java
+++ b/guacamole/src/main/java/net/sourceforge/guacamole/net/basic/BasicLogin.java
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 import net.sourceforge.guacamole.GuacamoleException;
-import net.sourceforge.guacamole.net.auth.UsernamePassword;
+import net.sourceforge.guacamole.net.auth.Credentials;
 import net.sourceforge.guacamole.properties.GuacamoleProperties;
 import net.sourceforge.guacamole.net.basic.properties.BasicGuacamoleProperties;
 import net.sourceforge.guacamole.protocol.GuacamoleConfiguration;
@@ -75,7 +75,10 @@ public class BasicLogin extends HttpServlet {
         String username = request.getParameter("username");
         String password = request.getParameter("password");
 
-        UsernamePassword credentials = new UsernamePassword();
+        // Build credentials object
+        Credentials credentials = new Credentials ();
+        credentials.setSession(httpSession);
+        credentials.setRequest(request);
         credentials.setUsername(username);
         credentials.setPassword(password);