diff --git a/src/as/com/threerings/whirled/client/SceneService_SceneMoveListener.as b/src/as/com/threerings/whirled/client/SceneService_SceneMoveListener.as
index 2809b5f5..18fbfa10 100644
--- a/src/as/com/threerings/whirled/client/SceneService_SceneMoveListener.as
+++ b/src/as/com/threerings/whirled/client/SceneService_SceneMoveListener.as
@@ -1,6 +1,6 @@
 package com.threerings.whirled.client {
 
-import com.threerings.presents.client.InvocationListener;
+import com.threerings.presents.client.InvocationService_InvocationListener;
 
 import com.threerings.io.TypedArray;
 
@@ -12,7 +12,8 @@ import com.threerings.whirled.data.SceneUpdate;
 /**
  * Used to communicate the response to a {@link #moveTo} request.
  */
-public interface SceneService_SceneMoveListener extends InvocationListener
+public interface SceneService_SceneMoveListener
+    extends InvocationService_InvocationListener
 {
     /**
      * Indicates that a move succeeded.
diff --git a/src/as/com/threerings/whirled/spot/client/SpotSceneDirector.as b/src/as/com/threerings/whirled/spot/client/SpotSceneDirector.as
index 4e6dff13..5633c7f6 100644
--- a/src/as/com/threerings/whirled/spot/client/SpotSceneDirector.as
+++ b/src/as/com/threerings/whirled/spot/client/SpotSceneDirector.as
@@ -27,7 +27,6 @@ import com.threerings.presents.client.BasicDirector;
 import com.threerings.presents.client.Client;
 import com.threerings.presents.client.ClientEvent;
 import com.threerings.presents.client.ConfirmAdapter;
-import com.threerings.presents.client.ConfirmListener;
 import com.threerings.presents.data.ClientObject;
 import com.threerings.presents.dobj.AttributeChangeListener;
 import com.threerings.presents.dobj.AttributeChangedEvent;
diff --git a/src/as/com/threerings/whirled/spot/client/SpotService.as b/src/as/com/threerings/whirled/spot/client/SpotService.as
index c38c6125..1e516e66 100644
--- a/src/as/com/threerings/whirled/spot/client/SpotService.as
+++ b/src/as/com/threerings/whirled/spot/client/SpotService.as
@@ -22,8 +22,8 @@
 package com.threerings.whirled.spot.client {
 
 import com.threerings.presents.client.Client;
-import com.threerings.presents.client.ConfirmListener;
 import com.threerings.presents.client.InvocationService;
+import com.threerings.presents.client.InvocationService_ConfirmListener;
 
 import com.threerings.whirled.client.SceneService_SceneMoveListener;
 import com.threerings.whirled.spot.data.Location;
@@ -59,7 +59,7 @@ public interface SpotService extends InvocationService
      */
     function changeLocation (
             client :Client, sceneId :int, loc :Location,
-            listener :ConfirmListener) :void;
+            listener :InvocationService_ConfirmListener) :void;
 
     /**
      * Requests that this client start or join the specified cluster. They
@@ -71,7 +71,8 @@ public interface SpotService extends InvocationService
      * if they are not already in one.
      */
     function joinCluster (
-            client :Client, friendOid :int, listener :ConfirmListener) :void;
+            client :Client, friendOid :int,
+            listener :InvocationService_ConfirmListener) :void;
 
     /**
      * Requests that the supplied message be delivered to listeners in the
diff --git a/src/as/com/threerings/whirled/spot/data/SpotMarshaller.as b/src/as/com/threerings/whirled/spot/data/SpotMarshaller.as
index 2ae4762f..711f3d8f 100644
--- a/src/as/com/threerings/whirled/spot/data/SpotMarshaller.as
+++ b/src/as/com/threerings/whirled/spot/data/SpotMarshaller.as
@@ -26,7 +26,7 @@ import com.threerings.util.Integer;
 
 import com.threerings.presents.client.Client;
 import com.threerings.presents.client.InvocationService;
-import com.threerings.presents.client.ConfirmListener;
+import com.threerings.presents.client.InvocationService_ConfirmListener;
 import com.threerings.presents.data.InvocationMarshaller;
 import com.threerings.presents.data.InvocationMarshaller_ConfirmMarshaller;
 import com.threerings.presents.dobj.InvocationResponseEvent;
@@ -50,7 +50,7 @@ public class SpotMarshaller extends InvocationMarshaller
     public static const CHANGE_LOCATION :int = 1;
 
     // documentation inherited from interface
-    public function changeLocation (arg1 :Client, arg2 :int, arg3 :Location, arg4 :ConfirmListener) :void
+    public function changeLocation (arg1 :Client, arg2 :int, arg3 :Location, arg4 :InvocationService_ConfirmListener) :void
     {
         var listener4 :InvocationMarshaller_ConfirmMarshaller = new InvocationMarshaller_ConfirmMarshaller();
         listener4.listener = arg4;
@@ -74,7 +74,7 @@ public class SpotMarshaller extends InvocationMarshaller
     public static const JOIN_CLUSTER :int = 3;
 
     // documentation inherited from interface
-    public function joinCluster (arg1 :Client, arg2 :int, arg3 :ConfirmListener) :void
+    public function joinCluster (arg1 :Client, arg2 :int, arg3 :InvocationService_ConfirmListener) :void
     {
         var listener3 :InvocationMarshaller_ConfirmMarshaller = new InvocationMarshaller_ConfirmMarshaller();
         listener3.listener = arg3;