diff --git a/src/java/com/threerings/jme/JmeApp.java b/src/java/com/threerings/jme/JmeApp.java
index b2a6c5d4e..f845d8cea 100644
--- a/src/java/com/threerings/jme/JmeApp.java
+++ b/src/java/com/threerings/jme/JmeApp.java
@@ -494,8 +494,8 @@ public class JmeApp
             return _display.getRenderer();
         }
 
-        public Camera getCamera () {
-            return _camera;
+        public CameraHandler getCameraHandler () {
+            return _camhand;
         }
 
         public Node getGeometry () {
diff --git a/src/java/com/threerings/jme/JmeContext.java b/src/java/com/threerings/jme/JmeContext.java
index e3f3d47a0..6dcc4c329 100644
--- a/src/java/com/threerings/jme/JmeContext.java
+++ b/src/java/com/threerings/jme/JmeContext.java
@@ -22,13 +22,14 @@
 package com.threerings.jme;
 
 import com.jme.input.InputHandler;
-import com.jme.renderer.Camera;
 import com.jme.renderer.Renderer;
 import com.jme.scene.Node;
 import com.jme.system.DisplaySystem;
 
 import com.jmex.bui.BRootNode;
 
+import com.threerings.jme.camera.CameraHandler;
+
 /**
  * Provides access to the various bits needed by things that operate in
  * JME land.
@@ -41,8 +42,8 @@ public interface JmeContext
     /** Returns the renderer being used to draw everything. */
     public Renderer getRenderer ();
 
-    /** Returns the camera being used to view the scene. */
-    public Camera getCamera ();
+    /** Returns the handler for the camera being used to view the scene. */
+    public CameraHandler getCameraHandler ();
 
     /** Returns the main geometry of our scene graph. */
     public Node getGeometry ();
diff --git a/tests/src/java/com/threerings/jme/client/JabberClient.java b/tests/src/java/com/threerings/jme/client/JabberClient.java
index d998b09b8..ad8817faf 100644
--- a/tests/src/java/com/threerings/jme/client/JabberClient.java
+++ b/tests/src/java/com/threerings/jme/client/JabberClient.java
@@ -23,7 +23,6 @@ package com.threerings.jme.client;
 
 import com.jmex.bui.BRootNode;
 import com.jme.input.InputHandler;
-import com.jme.renderer.Camera;
 import com.jme.renderer.Renderer;
 import com.jme.scene.Node;
 import com.jme.system.DisplaySystem;
@@ -42,6 +41,7 @@ import com.threerings.crowd.client.PlaceView;
 import com.threerings.crowd.util.CrowdContext;
 
 import com.threerings.jme.JmeContext;
+import com.threerings.jme.camera.CameraHandler;
 
 /**
  * The Jabber client takes care of instantiating all of the proper
@@ -187,8 +187,8 @@ public class JabberClient
             return _app.getContext().getDisplay();
         }
 
-        public Camera getCamera () {
-            return _app.getContext().getCamera();
+        public CameraHandler getCameraHandler () {
+            return _app.getContext().getCameraHandler();
         }
 
         public Node getGeometry () {