diff --git a/src/java/com/threerings/crowd/data/OccupantInfo.java b/src/java/com/threerings/crowd/data/OccupantInfo.java
index 6de23e886..d9c63ef2a 100644
--- a/src/java/com/threerings/crowd/data/OccupantInfo.java
+++ b/src/java/com/threerings/crowd/data/OccupantInfo.java
@@ -1,5 +1,5 @@
 //
-// $Id: OccupantInfo.java,v 1.14 2004/08/27 02:12:33 mdb Exp $
+// $Id$
 //
 // Narya library - tools for developing networked games
 // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -21,7 +21,7 @@
 
 package com.threerings.crowd.data;
 
-import com.threerings.io.TrackedStreamableObject;
+import com.threerings.io.SimpleStreamableObject;
 import com.threerings.util.Name;
 
 import com.threerings.presents.dobj.DSet;
@@ -44,7 +44,7 @@ import com.threerings.presents.dobj.DSet;
  * responsible for adding the code to clone those attributes when a clone
  * is requested.
  */
-public class OccupantInfo extends TrackedStreamableObject
+public class OccupantInfo extends SimpleStreamableObject
     implements DSet.Entry, Cloneable
 {
     /** Constant value for {@link #status}. */
diff --git a/src/java/com/threerings/crowd/data/PlaceConfig.java b/src/java/com/threerings/crowd/data/PlaceConfig.java
index 59ad6782b..2bbf5be98 100644
--- a/src/java/com/threerings/crowd/data/PlaceConfig.java
+++ b/src/java/com/threerings/crowd/data/PlaceConfig.java
@@ -23,7 +23,7 @@ package com.threerings.crowd.data;
 
 import com.samskivert.util.StringUtil;
 
-import com.threerings.io.TrackedStreamableObject;
+import com.threerings.io.SimpleStreamableObject;
 
 import com.threerings.crowd.client.LocationDirector;
 import com.threerings.crowd.client.PlaceController;
@@ -41,7 +41,7 @@ import com.threerings.crowd.client.PlaceController;
  * #getControllerClass} and {@link #getManagerClassName}, returning the
  * appropriate place controller and manager class for that place.
  */
-public abstract class PlaceConfig extends TrackedStreamableObject
+public abstract class PlaceConfig extends SimpleStreamableObject
 {
     /**
      * Returns the class that should be used to create a controller for
diff --git a/src/java/com/threerings/micasa/lobby/Lobby.java b/src/java/com/threerings/micasa/lobby/Lobby.java
index 39bca327e..308b1cb91 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.6 2004/08/27 02:12:50 mdb Exp $
+// $Id$
 //
 // Narya library - tools for developing networked games
 // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -21,13 +21,13 @@
 
 package com.threerings.micasa.lobby;
 
-import com.threerings.io.TrackedStreamableObject;
+import com.threerings.io.SimpleStreamableObject;
 
 /**
  * A simple class for keeping track of information for each lobby in
  * operation on the server.
  */
-public class Lobby extends TrackedStreamableObject
+public class Lobby extends SimpleStreamableObject
 {
     /** The object id of the lobby place object. */
     public int placeOid;
diff --git a/src/java/com/threerings/miso/data/MisoSceneModel.java b/src/java/com/threerings/miso/data/MisoSceneModel.java
index c0b6e3276..e5a0fe780 100644
--- a/src/java/com/threerings/miso/data/MisoSceneModel.java
+++ b/src/java/com/threerings/miso/data/MisoSceneModel.java
@@ -1,5 +1,5 @@
 //
-// $Id: MisoSceneModel.java,v 1.22 2004/08/27 02:20:06 mdb Exp $
+// $Id$
 //
 // Narya library - tools for developing networked games
 // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -24,7 +24,7 @@ package com.threerings.miso.data;
 import java.awt.Rectangle;
 import java.util.Random;
 
-import com.threerings.io.TrackedStreamableObject;
+import com.threerings.io.SimpleStreamableObject;
 
 import com.threerings.miso.util.ObjectSet;
 
@@ -32,7 +32,7 @@ import com.threerings.miso.util.ObjectSet;
  * Contains basic information for a miso scene model that is shared among
  * the specialized model implementations.
  */
-public abstract class MisoSceneModel extends TrackedStreamableObject
+public abstract class MisoSceneModel extends SimpleStreamableObject
     implements Cloneable
 {
     /**
diff --git a/src/java/com/threerings/miso/data/ObjectInfo.java b/src/java/com/threerings/miso/data/ObjectInfo.java
index d5683d05d..5fcdbe7d4 100644
--- a/src/java/com/threerings/miso/data/ObjectInfo.java
+++ b/src/java/com/threerings/miso/data/ObjectInfo.java
@@ -24,13 +24,12 @@ package com.threerings.miso.data;
 import com.samskivert.util.StringUtil;
 
 import com.threerings.io.SimpleStreamableObject;
-import com.threerings.io.TrackedStreamableObject;
 import com.threerings.media.tile.TileUtil;
 
 /**
  * Contains information about an object in a Miso scene.
  */
-public class ObjectInfo extends TrackedStreamableObject
+public class ObjectInfo extends SimpleStreamableObject
     implements Cloneable
 {
     /** The fully qualified object tile id. */
diff --git a/src/java/com/threerings/miso/data/SparseMisoSceneModel.java b/src/java/com/threerings/miso/data/SparseMisoSceneModel.java
index 5a13089c8..f69701ecd 100644
--- a/src/java/com/threerings/miso/data/SparseMisoSceneModel.java
+++ b/src/java/com/threerings/miso/data/SparseMisoSceneModel.java
@@ -29,7 +29,7 @@ import com.samskivert.util.ArrayUtil;
 import com.samskivert.util.ListUtil;
 import com.samskivert.util.StringUtil;
 
-import com.threerings.io.TrackedStreamableObject;
+import com.threerings.io.SimpleStreamableObject;
 
 import com.threerings.media.util.MathUtil;
 import com.threerings.util.StreamableHashIntMap;
@@ -53,7 +53,7 @@ public class SparseMisoSceneModel extends MisoSceneModel
     /** Contains information on a section of this scene. This is only
      * public so that the scene model parser can do its job, so don't go
      * poking around in here. */
-    public static class Section extends TrackedStreamableObject
+    public static class Section extends SimpleStreamableObject
         implements Cloneable
     {
         /** The tile coordinate of our upper leftmost tile. */
diff --git a/src/java/com/threerings/presents/dobj/DObject.java b/src/java/com/threerings/presents/dobj/DObject.java
index c86bdc455..51b54aab9 100644
--- a/src/java/com/threerings/presents/dobj/DObject.java
+++ b/src/java/com/threerings/presents/dobj/DObject.java
@@ -122,7 +122,7 @@ import com.threerings.presents.Log;
  *
  * Fields of type {@link Streamable} can also be used.
  */
-public class DObject extends TrackedObject
+public class DObject
     implements Streamable
 {
     public DObject ()
diff --git a/src/java/com/threerings/presents/net/DownstreamMessage.java b/src/java/com/threerings/presents/net/DownstreamMessage.java
index 62c186136..3233283a5 100644
--- a/src/java/com/threerings/presents/net/DownstreamMessage.java
+++ b/src/java/com/threerings/presents/net/DownstreamMessage.java
@@ -1,5 +1,5 @@
 //
-// $Id: DownstreamMessage.java,v 1.13 2004/08/27 02:20:22 mdb Exp $
+// $Id$
 //
 // Narya library - tools for developing networked games
 // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -21,14 +21,14 @@
 
 package com.threerings.presents.net;
 
-import com.threerings.io.TrackedStreamableObject;
+import com.threerings.io.SimpleStreamableObject;
 
 /**
  * This class encapsulates a message in the distributed object protocol
  * that flows from the server to the client. Downstream messages include
  * object subscription, event forwarding and session management.
  */
-public abstract class DownstreamMessage extends TrackedStreamableObject
+public abstract class DownstreamMessage extends SimpleStreamableObject
 {
     /**
      * The message id of the upstream message with which this downstream
diff --git a/src/java/com/threerings/presents/net/UpstreamMessage.java b/src/java/com/threerings/presents/net/UpstreamMessage.java
index f8e3337a5..8928669c5 100644
--- a/src/java/com/threerings/presents/net/UpstreamMessage.java
+++ b/src/java/com/threerings/presents/net/UpstreamMessage.java
@@ -1,5 +1,5 @@
 //
-// $Id: UpstreamMessage.java,v 1.14 2004/08/27 02:20:22 mdb Exp $
+// $Id$
 //
 // Narya library - tools for developing networked games
 // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -21,14 +21,14 @@
 
 package com.threerings.presents.net;
 
-import com.threerings.io.TrackedStreamableObject;
+import com.threerings.io.SimpleStreamableObject;
 
 /**
  * This class encapsulates a message in the distributed object protocol
  * that flows from the client to the server.  Upstream messages include
  * object subscription, event forwarding and session management.
  */
-public abstract class UpstreamMessage extends TrackedStreamableObject
+public abstract class UpstreamMessage extends SimpleStreamableObject
 {
     /**
      * This is a unique (within the context of a reasonable period of
diff --git a/src/java/com/threerings/puzzle/data/BoardSummary.java b/src/java/com/threerings/puzzle/data/BoardSummary.java
index 634dd5a2b..472b13184 100644
--- a/src/java/com/threerings/puzzle/data/BoardSummary.java
+++ b/src/java/com/threerings/puzzle/data/BoardSummary.java
@@ -21,7 +21,7 @@
 
 package com.threerings.puzzle.data;
 
-import com.threerings.io.TrackedStreamableObject;
+import com.threerings.io.SimpleStreamableObject;
 
 /**
  * Provides summarized data representing a player's board in a puzzle
@@ -34,7 +34,7 @@ import com.threerings.io.TrackedStreamableObject;
  * <p> Note all non-transient members of this and derived classes will
  * automatically be serialized when the summary is sent over the wire.
  */
-public abstract class BoardSummary extends TrackedStreamableObject
+public abstract class BoardSummary extends SimpleStreamableObject
 {
     /**
      * Constructs an empty board summary for use when un-serializing.
diff --git a/src/java/com/threerings/whirled/data/SceneModel.java b/src/java/com/threerings/whirled/data/SceneModel.java
index 9b7c5e50b..17cbcabe8 100644
--- a/src/java/com/threerings/whirled/data/SceneModel.java
+++ b/src/java/com/threerings/whirled/data/SceneModel.java
@@ -1,5 +1,5 @@
 //
-// $Id: SceneModel.java,v 1.11 2004/08/27 02:20:42 mdb Exp $
+// $Id$
 //
 // Narya library - tools for developing networked games
 // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -23,7 +23,7 @@ package com.threerings.whirled.data;
 
 import com.samskivert.util.ArrayUtil;
 
-import com.threerings.io.TrackedStreamableObject;
+import com.threerings.io.SimpleStreamableObject;
 
 /**
  * The scene model is the bare bones representation of the data for a
@@ -34,7 +34,7 @@ import com.threerings.io.TrackedStreamableObject;
  * what is transmitted over the wire when communicating scenes from the
  * server to the client.
  */
-public class SceneModel extends TrackedStreamableObject
+public class SceneModel extends SimpleStreamableObject
     implements Cloneable
 {
     /** This scene's unique identifier. */
diff --git a/src/java/com/threerings/whirled/spot/data/Location.java b/src/java/com/threerings/whirled/spot/data/Location.java
index 69bac2ebe..29da53679 100644
--- a/src/java/com/threerings/whirled/spot/data/Location.java
+++ b/src/java/com/threerings/whirled/spot/data/Location.java
@@ -21,14 +21,14 @@
 
 package com.threerings.whirled.spot.data;
 
-import com.threerings.io.TrackedStreamableObject;
+import com.threerings.io.SimpleStreamableObject;
 import com.threerings.util.DirectionCodes;
 import com.threerings.util.DirectionUtil;
 
 /**
  * Contains information on a scene occupant's position and orientation.
  */
-public class Location extends TrackedStreamableObject
+public class Location extends SimpleStreamableObject
     implements Cloneable
 {
     /** The user's x position (interpreted by the display system). */
diff --git a/src/java/com/threerings/whirled/spot/data/Portal.java b/src/java/com/threerings/whirled/spot/data/Portal.java
index 7f50a7a5e..dee2ff9cc 100644
--- a/src/java/com/threerings/whirled/spot/data/Portal.java
+++ b/src/java/com/threerings/whirled/spot/data/Portal.java
@@ -1,5 +1,5 @@
 //
-// $Id: Portal.java,v 1.7 2004/08/27 02:20:45 mdb Exp $
+// $Id$
 //
 // Narya library - tools for developing networked games
 // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -21,7 +21,7 @@
 
 package com.threerings.whirled.spot.data;
 
-import com.threerings.io.TrackedStreamableObject;
+import com.threerings.io.SimpleStreamableObject;
 import com.threerings.util.DirectionUtil;
 
 /**
@@ -33,7 +33,7 @@ import com.threerings.util.DirectionUtil;
  * when using this portal and the location at which the body sprite should
  * appear in that target scene.
  */
-public class Portal extends TrackedStreamableObject
+public class Portal extends SimpleStreamableObject
     implements Cloneable
 {
     /** This portal's unique identifier. */
diff --git a/src/java/com/threerings/whirled/spot/data/SpotSceneModel.java b/src/java/com/threerings/whirled/spot/data/SpotSceneModel.java
index b21a97358..80bfeba74 100644
--- a/src/java/com/threerings/whirled/spot/data/SpotSceneModel.java
+++ b/src/java/com/threerings/whirled/spot/data/SpotSceneModel.java
@@ -1,5 +1,5 @@
 //
-// $Id: SpotSceneModel.java,v 1.13 2004/10/23 17:36:32 mdb Exp $
+// $Id$
 //
 // Narya library - tools for developing networked games
 // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -24,7 +24,7 @@ package com.threerings.whirled.spot.data;
 import com.samskivert.util.ArrayUtil;
 import com.samskivert.util.ListUtil;
 
-import com.threerings.io.TrackedStreamableObject;
+import com.threerings.io.SimpleStreamableObject;
 
 import com.threerings.whirled.data.AuxModel;
 import com.threerings.whirled.data.SceneModel;
@@ -35,7 +35,7 @@ import com.threerings.whirled.data.SceneModel;
  * scene and unchanging, so that portals can stably reference the target
  * portal in the scene to which they connect.
  */
-public class SpotSceneModel extends TrackedStreamableObject
+public class SpotSceneModel extends SimpleStreamableObject
     implements AuxModel
 {
     /** An array containing all portals in this scene. */
diff --git a/src/java/com/threerings/whirled/zone/data/ZoneSummary.java b/src/java/com/threerings/whirled/zone/data/ZoneSummary.java
index 68d883669..8af2660ec 100644
--- a/src/java/com/threerings/whirled/zone/data/ZoneSummary.java
+++ b/src/java/com/threerings/whirled/zone/data/ZoneSummary.java
@@ -1,5 +1,5 @@
 //
-// $Id: ZoneSummary.java,v 1.7 2004/08/27 02:20:51 mdb Exp $
+// $Id$
 //
 // Narya library - tools for developing networked games
 // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved
@@ -23,7 +23,7 @@ package com.threerings.whirled.zone.data;
 
 import com.samskivert.util.StringUtil;
 
-import com.threerings.io.TrackedStreamableObject;
+import com.threerings.io.SimpleStreamableObject;
 import com.threerings.util.Name;
 
 /**
@@ -31,7 +31,7 @@ import com.threerings.util.Name;
  * summary info on all of the scenes in this zone (which can be used to
  * generate a map of the zone on the client).
  */
-public class ZoneSummary extends TrackedStreamableObject
+public class ZoneSummary extends SimpleStreamableObject
 {
     /** The zone's fully qualified unique identifier. */
     public int zoneId;