diff --git a/src/java/com/threerings/micasa/client/ChatPanel.java b/src/java/com/threerings/micasa/client/ChatPanel.java
index f0f28293a..6da3bed71 100644
--- a/src/java/com/threerings/micasa/client/ChatPanel.java
+++ b/src/java/com/threerings/micasa/client/ChatPanel.java
@@ -1,5 +1,5 @@
 //
-// $Id: ChatPanel.java,v 1.3 2001/10/09 19:23:26 mdb Exp $
+// $Id: ChatPanel.java,v 1.4 2001/10/11 04:13:33 mdb Exp $
 
 package com.threerings.micasa.client;
 
@@ -11,11 +11,11 @@ import javax.swing.text.*;
 import java.util.StringTokenizer;
 
 import com.samskivert.swing.*;
-import com.threerings.cocktail.party.chat.*;
-import com.threerings.cocktail.party.client.*;
-import com.threerings.cocktail.party.data.OccupantInfo;
-import com.threerings.cocktail.party.data.PlaceObject;
-import com.threerings.cocktail.party.util.PartyContext;
+import com.threerings.crowd.chat.*;
+import com.threerings.crowd.client.*;
+import com.threerings.crowd.data.OccupantInfo;
+import com.threerings.crowd.data.PlaceObject;
+import com.threerings.crowd.util.CrowdContext;
 
 import com.threerings.micasa.Log;
 
@@ -23,7 +23,7 @@ public class ChatPanel
     extends JPanel
     implements ActionListener, ChatDisplay, OccupantObserver, PlaceView
 {
-    public ChatPanel (PartyContext ctx)
+    public ChatPanel (CrowdContext ctx)
     {
         // keep this around for later
         _ctx = ctx;
@@ -228,7 +228,7 @@ public class ChatPanel
         // nothing doing
     }
 
-    protected PartyContext _ctx;
+    protected CrowdContext _ctx;
     protected ChatDirector _chatdtr;
 
     protected JComboBox _roombox;
diff --git a/src/java/com/threerings/micasa/client/ClientController.java b/src/java/com/threerings/micasa/client/ClientController.java
index 9778c8edf..8a10a5530 100644
--- a/src/java/com/threerings/micasa/client/ClientController.java
+++ b/src/java/com/threerings/micasa/client/ClientController.java
@@ -1,5 +1,5 @@
 //
-// $Id: ClientController.java,v 1.6 2001/10/09 19:23:26 mdb Exp $
+// $Id: ClientController.java,v 1.7 2001/10/11 04:13:33 mdb Exp $
 
 package com.threerings.micasa.client;
 
@@ -7,13 +7,13 @@ import java.awt.event.ActionEvent;
 import com.samskivert.swing.Controller;
 import com.samskivert.util.StringUtil;
 
-import com.threerings.cocktail.cher.dobj.*;
-import com.threerings.cocktail.cher.client.*;
-import com.threerings.cocktail.cher.net.Credentials;
-import com.threerings.cocktail.cher.net.UsernamePasswordCreds;
+import com.threerings.presents.dobj.*;
+import com.threerings.presents.client.*;
+import com.threerings.presents.net.Credentials;
+import com.threerings.presents.net.UsernamePasswordCreds;
 
-import com.threerings.cocktail.party.client.*;
-import com.threerings.cocktail.party.data.*;
+import com.threerings.crowd.client.*;
+import com.threerings.crowd.data.*;
 
 import com.threerings.micasa.Log;
 import com.threerings.micasa.data.MiCasaBootstrapData;
diff --git a/src/java/com/threerings/micasa/client/LogonPanel.java b/src/java/com/threerings/micasa/client/LogonPanel.java
index 63f022f9a..8edb93b23 100644
--- a/src/java/com/threerings/micasa/client/LogonPanel.java
+++ b/src/java/com/threerings/micasa/client/LogonPanel.java
@@ -1,5 +1,5 @@
 //
-// $Id: LogonPanel.java,v 1.1 2001/10/03 23:24:09 mdb Exp $
+// $Id: LogonPanel.java,v 1.2 2001/10/11 04:13:33 mdb Exp $
 
 package com.threerings.micasa.client;
 
@@ -11,8 +11,8 @@ import javax.swing.*;
 
 import com.samskivert.swing.*;
 
-import com.threerings.cocktail.cher.client.Client;
-import com.threerings.cocktail.cher.net.*;
+import com.threerings.presents.client.Client;
+import com.threerings.presents.net.*;
 
 import com.threerings.micasa.util.MiCasaContext;
 
diff --git a/src/java/com/threerings/micasa/client/MiCasaClient.java b/src/java/com/threerings/micasa/client/MiCasaClient.java
index d0e576618..cb5e2cdd2 100644
--- a/src/java/com/threerings/micasa/client/MiCasaClient.java
+++ b/src/java/com/threerings/micasa/client/MiCasaClient.java
@@ -1,5 +1,5 @@
 //
-// $Id: MiCasaClient.java,v 1.2 2001/10/09 17:47:33 mdb Exp $
+// $Id: MiCasaClient.java,v 1.3 2001/10/11 04:13:33 mdb Exp $
 
 package com.threerings.micasa.client;
 
@@ -10,13 +10,13 @@ import javax.swing.SwingUtilities;
 
 import com.samskivert.util.Config;
 
-import com.threerings.cocktail.cher.client.*;
-import com.threerings.cocktail.cher.dobj.DObjectManager;
-import com.threerings.cocktail.cher.net.*;
+import com.threerings.presents.client.*;
+import com.threerings.presents.dobj.DObjectManager;
+import com.threerings.presents.net.*;
 
-import com.threerings.cocktail.party.client.LocationDirector;
-import com.threerings.cocktail.party.client.OccupantManager;
-import com.threerings.cocktail.party.client.PlaceView;
+import com.threerings.crowd.client.LocationDirector;
+import com.threerings.crowd.client.OccupantManager;
+import com.threerings.crowd.client.PlaceView;
 
 import com.threerings.parlor.client.ParlorDirector;
 
diff --git a/src/java/com/threerings/micasa/client/OccupantList.java b/src/java/com/threerings/micasa/client/OccupantList.java
index 34453a939..c4266e590 100644
--- a/src/java/com/threerings/micasa/client/OccupantList.java
+++ b/src/java/com/threerings/micasa/client/OccupantList.java
@@ -1,15 +1,15 @@
 //
-// $Id: OccupantList.java,v 1.2 2001/10/09 00:48:34 mdb Exp $
+// $Id: OccupantList.java,v 1.3 2001/10/11 04:13:33 mdb Exp $
 
 package com.threerings.micasa.client;
 
 import java.util.Iterator;
 import javax.swing.*;
 
-import com.threerings.cocktail.party.client.OccupantObserver;
-import com.threerings.cocktail.party.client.PlaceView;
-import com.threerings.cocktail.party.data.OccupantInfo;
-import com.threerings.cocktail.party.data.PlaceObject;
+import com.threerings.crowd.client.OccupantObserver;
+import com.threerings.crowd.client.PlaceView;
+import com.threerings.crowd.data.OccupantInfo;
+import com.threerings.crowd.data.PlaceObject;
 
 import com.threerings.micasa.util.MiCasaContext;
 
diff --git a/src/java/com/threerings/micasa/data/MiCasaBootstrapData.java b/src/java/com/threerings/micasa/data/MiCasaBootstrapData.java
index a4230cf18..8223bd617 100644
--- a/src/java/com/threerings/micasa/data/MiCasaBootstrapData.java
+++ b/src/java/com/threerings/micasa/data/MiCasaBootstrapData.java
@@ -1,12 +1,12 @@
 //
-// $Id: MiCasaBootstrapData.java,v 1.1 2001/10/09 18:20:08 mdb Exp $
+// $Id: MiCasaBootstrapData.java,v 1.2 2001/10/11 04:13:33 mdb Exp $
 
 package com.threerings.micasa.data;
 
-import com.threerings.cocktail.cher.net.BootstrapData;
+import com.threerings.presents.net.BootstrapData;
 
 /**
- * Extends the basic Cher bootstrap data and provides some bootstrap
+ * Extends the basic Presents bootstrap data and provides some bootstrap
  * information specific to the MiCasa services.
  */
 public class MiCasaBootstrapData extends BootstrapData
diff --git a/src/java/com/threerings/micasa/lobby/Lobby.java b/src/java/com/threerings/micasa/lobby/Lobby.java
index af8471c35..ed6528ebb 100644
--- a/src/java/com/threerings/micasa/lobby/Lobby.java
+++ b/src/java/com/threerings/micasa/lobby/Lobby.java
@@ -1,5 +1,5 @@
 //
-// $Id: Lobby.java,v 1.1 2001/10/04 23:41:44 mdb Exp $
+// $Id: Lobby.java,v 1.2 2001/10/11 04:13:33 mdb Exp $
 
 package com.threerings.micasa.lobby;
 
@@ -7,7 +7,7 @@ import java.io.IOException;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 
-import com.threerings.cocktail.cher.io.Streamable;
+import com.threerings.presents.io.Streamable;
 
 /**
  * A simple class for keeping track of information for each lobby in
diff --git a/src/java/com/threerings/micasa/lobby/LobbyCodes.java b/src/java/com/threerings/micasa/lobby/LobbyCodes.java
index ef6e188a8..d59a6fcb9 100644
--- a/src/java/com/threerings/micasa/lobby/LobbyCodes.java
+++ b/src/java/com/threerings/micasa/lobby/LobbyCodes.java
@@ -1,9 +1,9 @@
 //
-// $Id: LobbyCodes.java,v 1.2 2001/10/04 23:41:44 mdb Exp $
+// $Id: LobbyCodes.java,v 1.3 2001/10/11 04:13:33 mdb Exp $
 
 package com.threerings.micasa.lobby;
 
-import com.threerings.cocktail.cher.client.InvocationCodes;
+import com.threerings.presents.client.InvocationCodes;
 
 /**
  * Contains codes used by the lobby invocation services.
diff --git a/src/java/com/threerings/micasa/lobby/LobbyConfig.java b/src/java/com/threerings/micasa/lobby/LobbyConfig.java
index 99c6a2491..f992aa46b 100644
--- a/src/java/com/threerings/micasa/lobby/LobbyConfig.java
+++ b/src/java/com/threerings/micasa/lobby/LobbyConfig.java
@@ -1,5 +1,5 @@
 //
-// $Id: LobbyConfig.java,v 1.2 2001/10/09 20:22:51 mdb Exp $
+// $Id: LobbyConfig.java,v 1.3 2001/10/11 04:13:33 mdb Exp $
 
 package com.threerings.micasa.lobby;
 
@@ -10,7 +10,7 @@ import java.io.DataOutputStream;
 import java.util.Properties;
 import com.samskivert.util.StringUtil;
 
-import com.threerings.cocktail.party.data.PlaceConfig;
+import com.threerings.crowd.data.PlaceConfig;
 
 import com.threerings.parlor.data.GameConfig;
 
diff --git a/src/java/com/threerings/micasa/lobby/LobbyController.java b/src/java/com/threerings/micasa/lobby/LobbyController.java
index ce784b1d7..886637a82 100644
--- a/src/java/com/threerings/micasa/lobby/LobbyController.java
+++ b/src/java/com/threerings/micasa/lobby/LobbyController.java
@@ -1,13 +1,13 @@
 //
-// $Id: LobbyController.java,v 1.4 2001/10/09 20:22:51 mdb Exp $
+// $Id: LobbyController.java,v 1.5 2001/10/11 04:13:33 mdb Exp $
 
 package com.threerings.micasa.lobby;
 
-import com.threerings.cocktail.party.data.PlaceConfig;
-import com.threerings.cocktail.party.data.PlaceObject;
-import com.threerings.cocktail.party.client.PlaceController;
-import com.threerings.cocktail.party.client.PlaceView;
-import com.threerings.cocktail.party.util.PartyContext;
+import com.threerings.crowd.data.PlaceConfig;
+import com.threerings.crowd.data.PlaceObject;
+import com.threerings.crowd.client.PlaceController;
+import com.threerings.crowd.client.PlaceView;
+import com.threerings.crowd.util.CrowdContext;
 
 import com.threerings.parlor.client.*;
 import com.threerings.parlor.data.GameConfig;
@@ -19,7 +19,7 @@ public class LobbyController
     extends PlaceController
     implements InvitationHandler, InvitationResponseObserver
 {
-    public void init (PartyContext ctx, PlaceConfig config)
+    public void init (CrowdContext ctx, PlaceConfig config)
     {
         // cast our context reference
         _ctx = (MiCasaContext)ctx;
diff --git a/src/java/com/threerings/micasa/lobby/LobbyManager.java b/src/java/com/threerings/micasa/lobby/LobbyManager.java
index e712321c2..be3cafce7 100644
--- a/src/java/com/threerings/micasa/lobby/LobbyManager.java
+++ b/src/java/com/threerings/micasa/lobby/LobbyManager.java
@@ -1,14 +1,14 @@
 //
-// $Id: LobbyManager.java,v 1.3 2001/10/09 17:47:33 mdb Exp $
+// $Id: LobbyManager.java,v 1.4 2001/10/11 04:13:33 mdb Exp $
 
 package com.threerings.micasa.lobby;
 
 import java.util.Properties;
 import com.samskivert.util.StringUtil;
 
-import com.threerings.cocktail.party.chat.ChatService;
-import com.threerings.cocktail.party.chat.ChatMessageHandler;
-import com.threerings.cocktail.party.server.PlaceManager;
+import com.threerings.crowd.chat.ChatService;
+import com.threerings.crowd.chat.ChatMessageHandler;
+import com.threerings.crowd.server.PlaceManager;
 import com.threerings.micasa.Log;
 
 /**
diff --git a/src/java/com/threerings/micasa/lobby/LobbyObject.dobj b/src/java/com/threerings/micasa/lobby/LobbyObject.dobj
index c36653e38..e402fcbc6 100644
--- a/src/java/com/threerings/micasa/lobby/LobbyObject.dobj
+++ b/src/java/com/threerings/micasa/lobby/LobbyObject.dobj
@@ -1,9 +1,9 @@
 //
-// $Id: LobbyObject.dobj,v 1.2 2001/10/04 23:41:44 mdb Exp $
+// $Id: LobbyObject.dobj,v 1.3 2001/10/11 04:13:33 mdb Exp $
 
 package com.threerings.micasa.lobby;
 
-import com.threerings.cocktail.party.data.PlaceObject;
+import com.threerings.crowd.data.PlaceObject;
 
 public class LobbyObject extends PlaceObject
 {
diff --git a/src/java/com/threerings/micasa/lobby/LobbyPanel.java b/src/java/com/threerings/micasa/lobby/LobbyPanel.java
index 632472796..1ac1b1856 100644
--- a/src/java/com/threerings/micasa/lobby/LobbyPanel.java
+++ b/src/java/com/threerings/micasa/lobby/LobbyPanel.java
@@ -1,13 +1,13 @@
 //
-// $Id: LobbyPanel.java,v 1.5 2001/10/09 19:49:59 mdb Exp $
+// $Id: LobbyPanel.java,v 1.6 2001/10/11 04:13:33 mdb Exp $
 
 package com.threerings.micasa.lobby;
 
 import javax.swing.*;
 import com.samskivert.swing.*;
 
-import com.threerings.cocktail.party.client.PlaceView;
-import com.threerings.cocktail.party.data.PlaceObject;
+import com.threerings.crowd.client.PlaceView;
+import com.threerings.crowd.data.PlaceObject;
 
 import com.threerings.micasa.client.*;
 import com.threerings.micasa.util.MiCasaContext;
diff --git a/src/java/com/threerings/micasa/lobby/LobbyProvider.java b/src/java/com/threerings/micasa/lobby/LobbyProvider.java
index 940ec2f4c..17a1331c8 100644
--- a/src/java/com/threerings/micasa/lobby/LobbyProvider.java
+++ b/src/java/com/threerings/micasa/lobby/LobbyProvider.java
@@ -1,11 +1,11 @@
 //
-// $Id: LobbyProvider.java,v 1.2 2001/10/04 23:41:44 mdb Exp $
+// $Id: LobbyProvider.java,v 1.3 2001/10/11 04:13:33 mdb Exp $
 
 package com.threerings.micasa.lobby;
 
-import com.threerings.cocktail.cher.server.InvocationProvider;
-import com.threerings.cocktail.cher.util.StreamableArrayList;
-import com.threerings.cocktail.party.data.BodyObject;
+import com.threerings.presents.server.InvocationProvider;
+import com.threerings.presents.util.StreamableArrayList;
+import com.threerings.crowd.data.BodyObject;
 
 /**
  * Handles server side of lobby-related invocation services.
diff --git a/src/java/com/threerings/micasa/lobby/LobbyRegistry.java b/src/java/com/threerings/micasa/lobby/LobbyRegistry.java
index ea87a97a5..ccdcf8591 100644
--- a/src/java/com/threerings/micasa/lobby/LobbyRegistry.java
+++ b/src/java/com/threerings/micasa/lobby/LobbyRegistry.java
@@ -1,13 +1,13 @@
 //
-// $Id: LobbyRegistry.java,v 1.5 2001/10/09 20:22:51 mdb Exp $
+// $Id: LobbyRegistry.java,v 1.6 2001/10/11 04:13:33 mdb Exp $
 
 package com.threerings.micasa.lobby;
 
 import java.util.*;
 import com.samskivert.util.*;
 
-import com.threerings.cocktail.cher.server.InvocationManager;
-import com.threerings.cocktail.party.data.BodyObject;
+import com.threerings.presents.server.InvocationManager;
+import com.threerings.crowd.data.BodyObject;
 
 import com.threerings.micasa.Log;
 import com.threerings.micasa.server.MiCasaServer;
diff --git a/src/java/com/threerings/micasa/lobby/LobbySelector.java b/src/java/com/threerings/micasa/lobby/LobbySelector.java
index 08e3d7609..6aaf5c607 100644
--- a/src/java/com/threerings/micasa/lobby/LobbySelector.java
+++ b/src/java/com/threerings/micasa/lobby/LobbySelector.java
@@ -1,5 +1,5 @@
 //
-// $Id: LobbySelector.java,v 1.2 2001/10/09 18:20:08 mdb Exp $
+// $Id: LobbySelector.java,v 1.3 2001/10/11 04:13:33 mdb Exp $
 
 package com.threerings.micasa.lobby;
 
@@ -15,7 +15,7 @@ import javax.swing.event.AncestorListener;
 
 import com.samskivert.util.StringUtil;
 
-import com.threerings.cocktail.party.data.PlaceObject;
+import com.threerings.crowd.data.PlaceObject;
 
 import com.threerings.micasa.Log;
 import com.threerings.micasa.lobby.Lobby;
diff --git a/src/java/com/threerings/micasa/lobby/LobbyService.java b/src/java/com/threerings/micasa/lobby/LobbyService.java
index 6c3beeb94..56ebb67b7 100644
--- a/src/java/com/threerings/micasa/lobby/LobbyService.java
+++ b/src/java/com/threerings/micasa/lobby/LobbyService.java
@@ -1,10 +1,10 @@
 //
-// $Id: LobbyService.java,v 1.1 2001/10/04 23:41:44 mdb Exp $
+// $Id: LobbyService.java,v 1.2 2001/10/11 04:13:33 mdb Exp $
 
 package com.threerings.micasa.lobby;
 
-import com.threerings.cocktail.cher.client.Client;
-import com.threerings.cocktail.cher.client.InvocationDirector;
+import com.threerings.presents.client.Client;
+import com.threerings.presents.client.InvocationDirector;
 
 import com.threerings.micasa.Log;
 
diff --git a/src/java/com/threerings/micasa/server/MiCasaClient.java b/src/java/com/threerings/micasa/server/MiCasaClient.java
index 15aeb3dde..67d34c3c7 100644
--- a/src/java/com/threerings/micasa/server/MiCasaClient.java
+++ b/src/java/com/threerings/micasa/server/MiCasaClient.java
@@ -1,18 +1,18 @@
 //
-// $Id: MiCasaClient.java,v 1.2 2001/10/09 19:23:50 mdb Exp $
+// $Id: MiCasaClient.java,v 1.3 2001/10/11 04:13:33 mdb Exp $
 
 package com.threerings.micasa.server;
 
-import com.threerings.cocktail.cher.net.BootstrapData;
-import com.threerings.cocktail.party.server.PartyClient;
+import com.threerings.presents.net.BootstrapData;
+import com.threerings.crowd.server.CrowdClient;
 
 import com.threerings.micasa.data.MiCasaBootstrapData;
 
 /**
- * Extends the cher client and provides bootstrap data specific to the
+ * Extends the Crowd client and provides bootstrap data specific to the
  * MiCasa services.
  */
-public class MiCasaClient extends PartyClient
+public class MiCasaClient extends CrowdClient
 {
     // documentation inherited
     protected BootstrapData createBootstrapData ()
diff --git a/src/java/com/threerings/micasa/server/MiCasaServer.java b/src/java/com/threerings/micasa/server/MiCasaServer.java
index e267c34a8..e184ab21e 100644
--- a/src/java/com/threerings/micasa/server/MiCasaServer.java
+++ b/src/java/com/threerings/micasa/server/MiCasaServer.java
@@ -1,5 +1,5 @@
 //
-// $Id: MiCasaServer.java,v 1.3 2001/10/09 18:20:08 mdb Exp $
+// $Id: MiCasaServer.java,v 1.4 2001/10/11 04:13:33 mdb Exp $
 
 package com.threerings.micasa.server;
 
@@ -7,7 +7,7 @@ import com.samskivert.jdbc.ConnectionProvider;
 import com.samskivert.jdbc.StaticConnectionProvider;
 import com.samskivert.util.Config;
 
-import com.threerings.cocktail.party.server.PartyServer;
+import com.threerings.crowd.server.CrowdServer;
 import com.threerings.parlor.server.ParlorManager;
 
 import com.threerings.micasa.Log;
@@ -17,7 +17,7 @@ import com.threerings.micasa.lobby.LobbyRegistry;
  * This class is the main entry point and general organizer of everything
  * that goes on in the MiCasa game server process.
  */
-public class MiCasaServer extends PartyServer
+public class MiCasaServer extends CrowdServer
 {
     /** The namespace used for server config properties. */
     public static final String CONFIG_KEY = "micasa";
@@ -37,7 +37,7 @@ public class MiCasaServer extends PartyServer
     public void init ()
         throws Exception
     {
-        // do the cher server initialization
+        // do the base server initialization
         super.init();
 
         // configure the client manager to use our client class