diff --git a/src/java/com/threerings/micasa/server/MiCasaServer.java b/src/java/com/threerings/micasa/server/MiCasaServer.java
index 14428f79..dee44b82 100644
--- a/src/java/com/threerings/micasa/server/MiCasaServer.java
+++ b/src/java/com/threerings/micasa/server/MiCasaServer.java
@@ -30,7 +30,7 @@ import com.threerings.util.Name;
 import com.threerings.presents.net.AuthRequest;
 import com.threerings.presents.server.ClientFactory;
 import com.threerings.presents.server.ClientResolver;
-import com.threerings.presents.server.PresentsClient;
+import com.threerings.presents.server.PresentsSession;
 
 import com.threerings.crowd.server.CrowdServer;
 
@@ -65,8 +65,8 @@ public class MiCasaServer extends CrowdServer
 
         // configure the client manager to use our client class
         _clmgr.setClientFactory(new ClientFactory() {
-            public Class<? extends PresentsClient> getClientClass (AuthRequest areq) {
-                return MiCasaClient.class;
+            public Class<? extends PresentsSession> getClientClass (AuthRequest areq) {
+                return MiCasaSession.class;
             }
             public Class<? extends ClientResolver> getClientResolverClass (Name username) {
                 return ClientResolver.class;
diff --git a/src/java/com/threerings/micasa/server/MiCasaClient.java b/src/java/com/threerings/micasa/server/MiCasaSession.java
similarity index 85%
rename from src/java/com/threerings/micasa/server/MiCasaClient.java
rename to src/java/com/threerings/micasa/server/MiCasaSession.java
index 0c64680d..07073be9 100644
--- a/src/java/com/threerings/micasa/server/MiCasaClient.java
+++ b/src/java/com/threerings/micasa/server/MiCasaSession.java
@@ -25,23 +25,23 @@ import com.google.inject.Inject;
 
 import com.threerings.presents.net.BootstrapData;
 
-import com.threerings.crowd.server.CrowdClient;
+import com.threerings.crowd.server.CrowdSession;
 
 import com.threerings.micasa.data.MiCasaBootstrapData;
 import com.threerings.micasa.lobby.LobbyRegistry;
 
 /**
- * Extends the Crowd client and provides bootstrap data specific to the MiCasa services.
+ * Extends the Crowd session and provides bootstrap data specific to the MiCasa services.
  */
-public class MiCasaClient extends CrowdClient
+public class MiCasaSession extends CrowdSession
 {
-    @Override // from PresentsClient
+    @Override // from PresentsSession
     protected BootstrapData createBootstrapData ()
     {
         return new MiCasaBootstrapData();
     }
 
-    @Override // from PresentsClient
+    @Override // from PresentsSession
     protected void populateBootstrapData (BootstrapData data)
     {
         super.populateBootstrapData(data);
diff --git a/src/java/com/threerings/whirled/server/WhirledClient.java b/src/java/com/threerings/whirled/server/WhirledClient.java
index 50a8febd..af4c485c 100644
--- a/src/java/com/threerings/whirled/server/WhirledClient.java
+++ b/src/java/com/threerings/whirled/server/WhirledClient.java
@@ -21,12 +21,12 @@
 
 package com.threerings.whirled.server;
 
-import com.threerings.crowd.server.CrowdClient;
+import com.threerings.crowd.server.CrowdSession;
 
 /**
  * The client object used by client management on the Whirled server.
  */
-public class WhirledClient extends CrowdClient
+public class WhirledClient extends CrowdSession
 {
     // nothing needed at the moment
 }
diff --git a/src/java/com/threerings/whirled/server/WhirledServer.java b/src/java/com/threerings/whirled/server/WhirledServer.java
index 447a5580..a6a7fd7d 100644
--- a/src/java/com/threerings/whirled/server/WhirledServer.java
+++ b/src/java/com/threerings/whirled/server/WhirledServer.java
@@ -28,7 +28,7 @@ import com.threerings.util.Name;
 import com.threerings.presents.net.AuthRequest;
 import com.threerings.presents.server.ClientFactory;
 import com.threerings.presents.server.ClientResolver;
-import com.threerings.presents.server.PresentsClient;
+import com.threerings.presents.server.PresentsSession;
 
 import com.threerings.crowd.server.CrowdServer;
 
@@ -55,7 +55,7 @@ public abstract class WhirledServer extends CrowdServer
 
         // configure the client to use our whirled client
         _clmgr.setClientFactory(new ClientFactory() {
-            public Class<? extends PresentsClient> getClientClass (AuthRequest areq) {
+            public Class<? extends PresentsSession> getClientClass (AuthRequest areq) {
                 return WhirledClient.class;
             }
             public Class<? extends ClientResolver> getClientResolverClass (Name username) {