diff --git a/examples/demo/Demo.cxx b/examples/demo/Demo.cxx
index 5c888f263..32ffb5cb7 100644
--- a/examples/demo/Demo.cxx
+++ b/examples/demo/Demo.cxx
@@ -19,11 +19,11 @@
 //============================================================================
 
 #include <vtkm/cont/testing/MakeTestDataSet.h>
-#include <vtkm/rendering/Window.h>
-#include <vtkm/rendering/RenderSurface.h>
-#include <vtkm/rendering/Scene.h>
+#include <vtkm/rendering/MapperGL.h>
 #include <vtkm/rendering/Plot.h>
-#include <vtkm/rendering/SceneRendererOSMesa.h>
+#include <vtkm/rendering/RenderSurfaceOSMesa.h>
+#include <vtkm/rendering/Scene.h>
+#include <vtkm/rendering/Window.h>
 #include <vtkm/cont/DeviceAdapter.h>
 #include <vtkm/cont/testing/Testing.h>
 
@@ -65,13 +65,13 @@ int main(int argc, char* argv[])
     fieldName = "SCALARS:pointvar";
   }
 
-  typedef vtkm::rendering::SceneRendererOSMesa< > SceneRenderer;
+  typedef vtkm::rendering::MapperGL< > Mapper;
   typedef vtkm::rendering::RenderSurfaceOSMesa RenderSurface;
 
   // Set up a view for rendering the input data
   const vtkm::cont::CoordinateSystem coords = inputData.GetCoordinateSystem();
-  SceneRenderer sceneRenderer;
-  vtkm::rendering::View3D &view = sceneRenderer.GetView();
+  Mapper mapper;
+  vtkm::rendering::View3D &view = mapper.GetView();
   vtkm::Float64 coordsBounds[6];
   coords.GetBounds(coordsBounds,VTKM_DEFAULT_DEVICE_ADAPTER_TAG());
   vtkm::Vec<vtkm::Float32,3> totalExtent;
@@ -89,8 +89,8 @@ int main(int argc, char* argv[])
   view.Width = 512;
   view.Position = totalExtent * (mag * 2.f);
   vtkm::rendering::ColorTable colorTable("thermal");
-  sceneRenderer.SetActiveColorTable(colorTable);
-  sceneRenderer.SetView(view);
+  mapper.SetActiveColorTable(colorTable);
+  mapper.SetView(view);
 
   // Create a scene for rendering the input data
   vtkm::rendering::Scene3D scene;
@@ -102,10 +102,10 @@ int main(int argc, char* argv[])
                                               colorTable));
 
   // Create a window and use it to render the input data using OS Mesa
-  vtkm::rendering::Window3D<SceneRenderer, RenderSurface> w1(scene,
-                                                             sceneRenderer,
-                                                             surface,
-                                                             bg);
+  vtkm::rendering::Window3D<Mapper, RenderSurface> w1(scene,
+                                                      mapper,
+                                                      surface,
+                                                      bg);
   w1.Initialize();
   w1.Paint();
   w1.SaveAs("demo_input.pnm");
@@ -127,8 +127,8 @@ int main(int argc, char* argv[])
                                               outputData.GetField(fieldName),
                                               colorTable));
 
-  vtkm::rendering::Window3D< SceneRenderer, RenderSurface> w2(scene,
-                                                              sceneRenderer,
+  vtkm::rendering::Window3D< Mapper, RenderSurface> w2(scene,
+                                                              mapper,
                                                               surface,
                                                               bg);
   w2.Initialize();
diff --git a/examples/rendering/Rendering.cxx b/examples/rendering/Rendering.cxx
index ce8390cc8..1617c9d8a 100644
--- a/examples/rendering/Rendering.cxx
+++ b/examples/rendering/Rendering.cxx
@@ -43,10 +43,10 @@
 #include <vtkm/rendering/Window.h>
 #include <vtkm/rendering/WorldAnnotatorGL.h>
 #include <vtkm/rendering/RenderSurfaceGL.h>
-#include <vtkm/rendering/SceneRendererGL.h>
+#include <vtkm/rendering/MapperGL.h>
 #include <vtkm/rendering/ColorTable.h>
 
-vtkm::rendering::Window3D<vtkm::rendering::SceneRendererGL<VTKM_DEFAULT_DEVICE_ADAPTER_TAG>,
+vtkm::rendering::Window3D<vtkm::rendering::MapperGL<VTKM_DEFAULT_DEVICE_ADAPTER_TAG>,
                           vtkm::rendering::RenderSurfaceGL,
                           vtkm::rendering::WorldAnnotatorGL> *window = NULL;
 
@@ -168,7 +168,7 @@ main(int argc, char* argv[])
 
     vtkm::rendering::Color bg(0.2f, 0.2f, 0.2f, 1.0f);
     vtkm::rendering::RenderSurfaceGL surface(W,H,bg);
-    vtkm::rendering::SceneRendererGL<VTKM_DEFAULT_DEVICE_ADAPTER_TAG> sceneRenderer;
+    vtkm::rendering::MapperGL<VTKM_DEFAULT_DEVICE_ADAPTER_TAG> mapper;
 
     vtkm::rendering::Scene scene;
     scene.Plots.push_back(vtkm::rendering::Plot(ds.GetCellSet(),
@@ -177,9 +177,9 @@ main(int argc, char* argv[])
                                                 vtkm::rendering::ColorTable("thermal")));
 
     //Create vtkm rendering stuff.
-    window = new vtkm::rendering::Window3D<vtkm::rendering::SceneRendererGL<VTKM_DEFAULT_DEVICE_ADAPTER_TAG>,
+    window = new vtkm::rendering::Window3D<vtkm::rendering::MapperGL<VTKM_DEFAULT_DEVICE_ADAPTER_TAG>,
                                            vtkm::rendering::RenderSurfaceGL,
-                                           vtkm::rendering::WorldAnnotatorGL>(scene, sceneRenderer,
+                                           vtkm::rendering::WorldAnnotatorGL>(scene, mapper,
                                                                               surface, camera, bg);
     window->Initialize();
     glutMainLoop();
diff --git a/vtkm/rendering/AxisAnnotation.h b/vtkm/rendering/AxisAnnotation.h
index c23da1a09..46d1fa49d 100644
--- a/vtkm/rendering/AxisAnnotation.h
+++ b/vtkm/rendering/AxisAnnotation.h
@@ -21,7 +21,6 @@
 #define vtk_m_rendering_AxisAnnotation_h
 
 #include <vtkm/cont/DataSet.h>
-#include <vtkm/rendering/SceneRenderer.h>
 #include <vtkm/rendering/Color.h>
 #include <vtkm/rendering/Scene.h>
 #include <vtkm/rendering/WorldAnnotator.h>
diff --git a/vtkm/rendering/AxisAnnotation2D.h b/vtkm/rendering/AxisAnnotation2D.h
index 50cd088cd..5a8137e2e 100644
--- a/vtkm/rendering/AxisAnnotation2D.h
+++ b/vtkm/rendering/AxisAnnotation2D.h
@@ -21,7 +21,6 @@
 #define vtk_m_rendering_AxisAnnotation2D_h
 
 #include <vtkm/cont/DataSet.h>
-#include <vtkm/rendering/SceneRenderer.h>
 #include <vtkm/rendering/Camera.h>
 #include <vtkm/rendering/Color.h>
 #include <vtkm/rendering/Scene.h>
diff --git a/vtkm/rendering/AxisAnnotation3D.h b/vtkm/rendering/AxisAnnotation3D.h
index b47029e14..027ec0f89 100644
--- a/vtkm/rendering/AxisAnnotation3D.h
+++ b/vtkm/rendering/AxisAnnotation3D.h
@@ -21,7 +21,6 @@
 #define vtk_m_rendering_AxisAnnotation3D_h
 
 #include <vtkm/cont/DataSet.h>
-#include <vtkm/rendering/SceneRenderer.h>
 #include <vtkm/rendering/Camera.h>
 #include <vtkm/rendering/Color.h>
 #include <vtkm/rendering/Scene.h>
diff --git a/vtkm/rendering/BoundingBoxAnnotation.h b/vtkm/rendering/BoundingBoxAnnotation.h
index 673aae578..988790c05 100644
--- a/vtkm/rendering/BoundingBoxAnnotation.h
+++ b/vtkm/rendering/BoundingBoxAnnotation.h
@@ -21,7 +21,6 @@
 #define vtk_m_rendering_BoundingBoxAnnotation_h
 
 #include <vtkm/cont/DataSet.h>
-#include <vtkm/rendering/SceneRenderer.h>
 #include <vtkm/rendering/Camera.h>
 #include <vtkm/rendering/Color.h>
 #include <vtkm/rendering/Scene.h>
diff --git a/vtkm/rendering/CMakeLists.txt b/vtkm/rendering/CMakeLists.txt
index 1a774f86f..b32d3dd51 100644
--- a/vtkm/rendering/CMakeLists.txt
+++ b/vtkm/rendering/CMakeLists.txt
@@ -34,9 +34,9 @@ set(headers
   RenderSurface.h
   RenderSurfaceRayTracer.h
   Scene.h
-  SceneRenderer.h
-  SceneRendererRayTracer.h
-  SceneRendererVolume.h
+  Mapper.h
+  MapperRayTracer.h
+  MapperVolume.h
   TextAnnotation.h
   Triangulator.h
   Window.h
@@ -45,7 +45,7 @@ set(headers
 
 set(opengl_headers
   RenderSurfaceGL.h
-  SceneRendererGL.h
+  MapperGL.h
   TextureGL.h
   WorldAnnotatorGL.h
   )
diff --git a/vtkm/rendering/SceneRenderer.h b/vtkm/rendering/Mapper.h
similarity index 93%
rename from vtkm/rendering/SceneRenderer.h
rename to vtkm/rendering/Mapper.h
index 3b2fa8006..27f688a50 100644
--- a/vtkm/rendering/SceneRenderer.h
+++ b/vtkm/rendering/Mapper.h
@@ -17,8 +17,8 @@
 //  Laboratory (LANL), the U.S. Government retains certain rights in
 //  this software.
 //============================================================================
-#ifndef vtk_m_rendering_SceneRenderer_h
-#define vtk_m_rendering_SceneRenderer_h
+#ifndef vtk_m_rendering_Mapper_h
+#define vtk_m_rendering_Mapper_h
 
 #include <vtkm/cont/DataSet.h>
 #include <vtkm/rendering/Camera.h>
@@ -27,16 +27,16 @@
 namespace vtkm {
 namespace rendering {
 
-class SceneRenderer
+class Mapper
 {
 public:
   VTKM_CONT_EXPORT
-  SceneRenderer()
+  Mapper()
   {
   }
 
   VTKM_CONT_EXPORT
-  virtual ~SceneRenderer()
+  virtual ~Mapper()
   {}
 
   VTKM_CONT_EXPORT
@@ -88,4 +88,4 @@ protected:
     vtkm::Vec<vtkm::Float32,4> BackgroundColor;
 };
 }} //namespace vtkm::rendering
-#endif //vtk_m_rendering_SceneRenderer_h
+#endif //vtk_m_rendering_Mapper_h
diff --git a/vtkm/rendering/SceneRendererGL.h b/vtkm/rendering/MapperGL.h
similarity index 95%
rename from vtkm/rendering/SceneRendererGL.h
rename to vtkm/rendering/MapperGL.h
index 5a79c5d21..a9fb40a1f 100644
--- a/vtkm/rendering/SceneRendererGL.h
+++ b/vtkm/rendering/MapperGL.h
@@ -17,15 +17,15 @@
 //  Laboratory (LANL), the U.S. Government retains certain rights in
 //  this software.
 //============================================================================
-#ifndef vtk_m_rendering_SceneRendererGL_h
-#define vtk_m_rendering_SceneRendererGL_h
+#ifndef vtk_m_rendering_MapperGL_h
+#define vtk_m_rendering_MapperGL_h
 
 #include <vtkm/cont/DataSet.h>
 #include <vtkm/cont/CoordinateSystem.h>
 #include <vtkm/cont/DynamicArrayHandle.h>
 #include <vtkm/rendering/Camera.h>
 #include <vtkm/rendering/ColorTable.h>
-#include <vtkm/rendering/SceneRenderer.h>
+#include <vtkm/rendering/Mapper.h>
 #include <vtkm/rendering/Triangulator.h>
 #include <vtkm/rendering/internal/OpenGLHeaders.h>
 
@@ -38,11 +38,11 @@ namespace vtkm {
 namespace rendering {
 
 template<typename DeviceAdapter = VTKM_DEFAULT_DEVICE_ADAPTER_TAG>
-class SceneRendererGL : public SceneRenderer
+class MapperGL : public Mapper
 {
 public:
   VTKM_CONT_EXPORT
-  SceneRendererGL() {}
+  MapperGL() {}
 
   VTKM_CONT_EXPORT
   virtual void RenderCells(const vtkm::cont::DynamicCellSet &cellset,
@@ -142,4 +142,4 @@ public:
 
 }} //namespace vtkm::rendering
 
-#endif //vtk_m_rendering_SceneRendererGL_h
+#endif //vtk_m_rendering_MapperGL_h
diff --git a/vtkm/rendering/SceneRendererRayTracer.h b/vtkm/rendering/MapperRayTracer.h
similarity index 92%
rename from vtkm/rendering/SceneRendererRayTracer.h
rename to vtkm/rendering/MapperRayTracer.h
index c6bf3c99c..20effcdf7 100644
--- a/vtkm/rendering/SceneRendererRayTracer.h
+++ b/vtkm/rendering/MapperRayTracer.h
@@ -17,13 +17,13 @@
 //  Laboratory (LANL), the U.S. Government retains certain rights in
 //  this software.
 //============================================================================
-#ifndef vtk_m_rendering_SceneRendererRayTracer_h
-#define vtk_m_rendering_SceneRendererRayTracer_h
+#ifndef vtk_m_rendering_MapperRayTracer_h
+#define vtk_m_rendering_MapperRayTracer_h
 #include <vtkm/cont/Timer.h>
 #include <vtkm/cont/internal/DeviceAdapterTagSerial.h>
 #include <vtkm/rendering/ColorTable.h>
+#include <vtkm/rendering/Mapper.h>
 #include <vtkm/rendering/Triangulator.h>
-#include <vtkm/rendering/SceneRenderer.h>
 #include <vtkm/rendering/raytracing/RayTracer.h>
 #include <vtkm/rendering/raytracing/Camera.h>
 #include <vtkm/rendering/RenderSurfaceRayTracer.h>
@@ -33,7 +33,7 @@ namespace rendering {
 
 //  static bool doOnce = true;
 template<typename DeviceAdapter = VTKM_DEFAULT_DEVICE_ADAPTER_TAG>
-class SceneRendererRayTracer : public SceneRenderer
+class MapperRayTracer : public Mapper
 {
 protected:
   vtkm::cont::ArrayHandle<vtkm::Vec<vtkm::Float32,4> > ColorMap;
@@ -41,7 +41,7 @@ protected:
   RenderSurfaceRayTracer *Surface;
 public:
   VTKM_CONT_EXPORT
-  SceneRendererRayTracer()
+  MapperRayTracer()
   {
     Surface = NULL;
   }
@@ -92,4 +92,4 @@ public:
   }
 };
 }} //namespace vtkm::rendering
-#endif //vtk_m_rendering_SceneRendererRayTracer_h
+#endif //vtk_m_rendering_MapperRayTracer_h
diff --git a/vtkm/rendering/SceneRendererVolume.h b/vtkm/rendering/MapperVolume.h
similarity index 92%
rename from vtkm/rendering/SceneRendererVolume.h
rename to vtkm/rendering/MapperVolume.h
index e66d8968f..0db559e33 100644
--- a/vtkm/rendering/SceneRendererVolume.h
+++ b/vtkm/rendering/MapperVolume.h
@@ -17,12 +17,12 @@
 //  Laboratory (LANL), the U.S. Government retains certain rights in
 //  this software.
 //============================================================================
-#ifndef vtk_m_rendering_SceneRendererVolume_h
-#define vtk_m_rendering_SceneRendererVolume_h
+#ifndef vtk_m_rendering_MapperVolume_h
+#define vtk_m_rendering_MapperVolume_h
 
 #include <vtkm/rendering/ColorTable.h>
+#include <vtkm/rendering/Mapper.h>
 #include <vtkm/rendering/Triangulator.h>
-#include <vtkm/rendering/SceneRenderer.h>
 #include <vtkm/rendering/raytracing/VolumeRendererStructured.h>
 #include <vtkm/rendering/raytracing/Camera.h>
 #include <vtkm/rendering/RenderSurfaceRayTracer.h>
@@ -33,14 +33,14 @@
 namespace vtkm {
 namespace rendering {
 template<typename DeviceAdapter = VTKM_DEFAULT_DEVICE_ADAPTER_TAG>
-class SceneRendererVolume : public SceneRenderer
+class MapperVolume : public Mapper
 {
 protected:
   vtkm::rendering::raytracing::VolumeRendererStructured<DeviceAdapter>  Tracer;
   RenderSurfaceRayTracer *Surface;
 public:
   VTKM_CONT_EXPORT
-  SceneRendererVolume()
+  MapperVolume()
   {
     Surface = NULL;
   }
@@ -98,4 +98,4 @@ public:
   }
 };
 }} //namespace vtkm::rendering
-#endif //vtk_m_rendering_SceneRendererVolume_h
+#endif //vtk_m_rendering_MapperVolume_h
diff --git a/vtkm/rendering/Plot.h b/vtkm/rendering/Plot.h
index 7214201bc..e633a76ec 100644
--- a/vtkm/rendering/Plot.h
+++ b/vtkm/rendering/Plot.h
@@ -22,7 +22,7 @@
 
 #include <vtkm/Assert.h>
 #include <vtkm/rendering/Camera.h>
-#include <vtkm/rendering/SceneRenderer.h>
+#include <vtkm/rendering/Mapper.h>
 #include <vector>
 
 namespace vtkm {
@@ -50,20 +50,20 @@ public:
         coordinates.GetBounds(VTKM_DEFAULT_DEVICE_ADAPTER_TAG());
   }
 
-  template<typename SceneRendererType, typename SurfaceType>
+  template<typename MapperType, typename SurfaceType>
   VTKM_CONT_EXPORT
-  void Render(SceneRendererType &sceneRenderer,
+  void Render(MapperType &mapper,
               SurfaceType &surface,
               vtkm::rendering::Camera &camera)
   {
-    sceneRenderer.SetRenderSurface(&surface);
-    sceneRenderer.SetActiveColorTable(this->ColorTable);
-    sceneRenderer.RenderCells(this->Cells,
-                              this->Coordinates,
-                              this->ScalarField,
-                              this->ColorTable,
-                              camera,
-                              this->ScalarRange);
+    mapper.SetRenderSurface(&surface);
+    mapper.SetActiveColorTable(this->ColorTable);
+    mapper.RenderCells(this->Cells,
+                       this->Coordinates,
+                       this->ScalarField,
+                       this->ColorTable,
+                       camera,
+                       this->ScalarRange);
   }
 
   vtkm::cont::DynamicCellSet Cells;
diff --git a/vtkm/rendering/Scene.h b/vtkm/rendering/Scene.h
index a0c6abf99..811eb2df5 100644
--- a/vtkm/rendering/Scene.h
+++ b/vtkm/rendering/Scene.h
@@ -34,23 +34,23 @@ public:
 
   Scene() {}
 
-  template<typename SceneRendererType, typename SurfaceType>
+  template<typename MapperType, typename SurfaceType>
   VTKM_CONT_EXPORT
-  void Render(SceneRendererType &sceneRenderer,
+  void Render(MapperType &mapper,
               SurfaceType &surface,
               vtkm::rendering::Camera &camera)
   {
     vtkm::Bounds bounds;
 
-    sceneRenderer.StartScene();
+    mapper.StartScene();
     for (std::size_t i = 0; i < this->Plots.size(); i++)
     {
-      this->Plots[i].Render(sceneRenderer, surface, camera);
+      this->Plots[i].Render(mapper, surface, camera);
 
       // accumulate all Plots' spatial bounds into the scene spatial bounds
       bounds.Include(this->Plots[i].SpatialBounds);
     }
-    sceneRenderer.EndScene();
+    mapper.EndScene();
 
     this->SpatialBounds = bounds;
   }
diff --git a/vtkm/rendering/Window.h b/vtkm/rendering/Window.h
index fd358d71f..ef4d23154 100644
--- a/vtkm/rendering/Window.h
+++ b/vtkm/rendering/Window.h
@@ -29,34 +29,33 @@
 #include <vtkm/rendering/ColorBarAnnotation.h>
 #include <vtkm/rendering/TextAnnotation.h>
 #include <vtkm/rendering/Scene.h>
-#include <vtkm/rendering/SceneRenderer.h>
 
 namespace vtkm {
 namespace rendering {
 
-template<typename SceneRendererType,
+template<typename MapperType,
          typename SurfaceType,
          typename WorldAnnotatorType>
 class Window
 {
 public:
-  SceneRendererType SceneRenderer;
+  MapperType Mapper;
   SurfaceType Surface;
   vtkm::rendering::Camera Camera;
   Color BackgroundColor;
   WorldAnnotatorType WorldAnnotator;
 
-  Window(const SceneRendererType &sceneRenderer,
+  Window(const MapperType &mapper,
          const SurfaceType &surface,
          const vtkm::rendering::Camera &camera,
          const vtkm::rendering::Color &backgroundColor =
            vtkm::rendering::Color(0,0,0,1))
-    : SceneRenderer(sceneRenderer),
+    : Mapper(mapper),
       Surface(surface),
       Camera(camera),
       BackgroundColor(backgroundColor)
   {
-    this->SceneRenderer.SetBackgroundColor(this->BackgroundColor);
+    this->Mapper.SetBackgroundColor(this->BackgroundColor);
   }
 
   VTKM_CONT_EXPORT
@@ -92,12 +91,12 @@ protected:
 };
 
 // Window2D Window3D
-template<typename SceneRendererType,
+template<typename MapperType,
          typename SurfaceType,
          typename WorldAnnotatorType>
-class Window3D : public Window<SceneRendererType, SurfaceType,WorldAnnotatorType>
+class Window3D : public Window<MapperType, SurfaceType,WorldAnnotatorType>
 {
-  typedef Window<SceneRendererType, SurfaceType,WorldAnnotatorType> Superclass;
+  typedef Window<MapperType, SurfaceType,WorldAnnotatorType> Superclass;
 public:
   vtkm::rendering::Scene Scene;
   // 3D-specific annotations
@@ -109,12 +108,12 @@ public:
 
   VTKM_CONT_EXPORT
   Window3D(const vtkm::rendering::Scene &scene,
-           const SceneRendererType &sceneRenderer,
+           const MapperType &mapper,
            const SurfaceType &surface,
            const vtkm::rendering::Camera &camera,
            const vtkm::rendering::Color &backgroundColor =
              vtkm::rendering::Color(0,0,0,1))
-    : Superclass(sceneRenderer,surface,camera,backgroundColor),
+    : Superclass(mapper,surface,camera,backgroundColor),
       Scene(scene)
   {
   }
@@ -125,7 +124,7 @@ public:
     this->Surface.Activate();
     this->Surface.Clear();
     this->SetupForWorldSpace();
-    this->Scene.Render(this->SceneRenderer, this->Surface, this->Camera);
+    this->Scene.Render(this->Mapper, this->Surface, this->Camera);
     this->RenderWorldAnnotations();
 
     this->SetupForScreenSpace();
@@ -225,12 +224,12 @@ public:
   }
 };
 
-template<typename SceneRendererType,
+template<typename MapperType,
          typename SurfaceType,
          typename WorldAnnotatorType>
-class Window2D : public Window<SceneRendererType, SurfaceType,WorldAnnotatorType>
+class Window2D : public Window<MapperType, SurfaceType,WorldAnnotatorType>
 {
-  typedef Window<SceneRendererType, SurfaceType,WorldAnnotatorType> Superclass;
+  typedef Window<MapperType, SurfaceType,WorldAnnotatorType> Superclass;
 public:
   vtkm::rendering::Scene Scene;
   // 2D-specific annotations
@@ -240,12 +239,12 @@ public:
 
   VTKM_CONT_EXPORT
   Window2D(const vtkm::rendering::Scene &scene,
-           const SceneRendererType &sceneRenderer,
+           const MapperType &mapper,
            const SurfaceType &surface,
            const vtkm::rendering::Camera &camera,
            const vtkm::rendering::Color &backgroundColor =
              vtkm::rendering::Color(0,0,0,1))
-    : Superclass(sceneRenderer, surface, camera, backgroundColor),
+    : Superclass(mapper, surface, camera, backgroundColor),
       Scene(scene)
   {
   }
@@ -257,7 +256,7 @@ public:
     this->Surface.Clear();
     this->SetupForWorldSpace();
 
-    this->Scene.Render(this->SceneRenderer, this->Surface, this->Camera);
+    this->Scene.Render(this->Mapper, this->Surface, this->Camera);
     this->RenderWorldAnnotations();
 
     this->SetupForScreenSpace();
diff --git a/vtkm/rendering/WorldAnnotator.h b/vtkm/rendering/WorldAnnotator.h
index 8722d21ae..954c27d76 100644
--- a/vtkm/rendering/WorldAnnotator.h
+++ b/vtkm/rendering/WorldAnnotator.h
@@ -21,7 +21,6 @@
 #define vtk_m_rendering_WorldAnnotator_h
 
 #include <vtkm/cont/DataSet.h>
-#include <vtkm/rendering/SceneRenderer.h>
 #include <vtkm/rendering/Color.h>
 #include <vtkm/rendering/Scene.h>
 
diff --git a/vtkm/rendering/WorldAnnotatorGL.h b/vtkm/rendering/WorldAnnotatorGL.h
index 308ef55c2..c49f0384c 100644
--- a/vtkm/rendering/WorldAnnotatorGL.h
+++ b/vtkm/rendering/WorldAnnotatorGL.h
@@ -27,7 +27,6 @@
 #include <vtkm/rendering/Color.h>
 #include <vtkm/rendering/MatrixHelpers.h>
 #include <vtkm/rendering/Scene.h>
-#include <vtkm/rendering/SceneRenderer.h>
 #include <vtkm/rendering/TextureGL.h>
 #include <vtkm/rendering/WorldAnnotator.h>
 
diff --git a/vtkm/rendering/testing/CMakeLists.txt b/vtkm/rendering/testing/CMakeLists.txt
index 5ca2d34a1..2cea45310 100644
--- a/vtkm/rendering/testing/CMakeLists.txt
+++ b/vtkm/rendering/testing/CMakeLists.txt
@@ -19,13 +19,13 @@
 ##============================================================================
 
 set(unit_tests
-  UnitTestSceneRendererRayTracer.cxx
-  UnitTestSceneRendererVolume.cxx
+  UnitTestMapperRayTracer.cxx
+  UnitTestMapperVolume.cxx
 )
 
 if (OSMESA_FOUND)
   set(unit_tests ${unit_tests}
-    UnitTestSceneRendererOSMesa.cxx
+    UnitTestMapperOSMesa.cxx
     )
 endif()
 
diff --git a/vtkm/rendering/testing/UnitTestSceneRendererOSMesa.cxx b/vtkm/rendering/testing/UnitTestMapperOSMesa.cxx
similarity index 92%
rename from vtkm/rendering/testing/UnitTestSceneRendererOSMesa.cxx
rename to vtkm/rendering/testing/UnitTestMapperOSMesa.cxx
index 30989ad3a..f04146b1d 100644
--- a/vtkm/rendering/testing/UnitTestSceneRendererOSMesa.cxx
+++ b/vtkm/rendering/testing/UnitTestMapperOSMesa.cxx
@@ -19,12 +19,12 @@
 //============================================================================
 #include <vtkm/Bounds.h>
 #include <vtkm/cont/testing/MakeTestDataSet.h>
-#include <vtkm/rendering/Window.h>
-#include <vtkm/rendering/RenderSurfaceOSMesa.h>
-#include <vtkm/rendering/WorldAnnotatorGL.h>
-#include <vtkm/rendering/Scene.h>
+#include <vtkm/rendering/MapperGL.h>
 #include <vtkm/rendering/Plot.h>
-#include <vtkm/rendering/SceneRendererGL.h>
+#include <vtkm/rendering/RenderSurfaceOSMesa.h>
+#include <vtkm/rendering/Scene.h>
+#include <vtkm/rendering/Window.h>
+#include <vtkm/rendering/WorldAnnotatorGL.h>
 #include <vtkm/cont/DeviceAdapter.h>
 #include <vtkm/cont/testing/Testing.h>
 
@@ -99,7 +99,7 @@ void Render3D(const vtkm::cont::DataSet &ds,
 {
     const vtkm::Int32 W = 512, H = 512;
     const vtkm::cont::CoordinateSystem coords = ds.GetCoordinateSystem();
-    vtkm::rendering::SceneRendererGL<VTKM_DEFAULT_DEVICE_ADAPTER_TAG> sceneRenderer;
+    vtkm::rendering::MapperGL<VTKM_DEFAULT_DEVICE_ADAPTER_TAG> mapper;
 
     vtkm::rendering::View view;
     Set3DView(view, coords, W, H);
@@ -114,10 +114,10 @@ void Render3D(const vtkm::cont::DataSet &ds,
                                                 vtkm::rendering::ColorTable(ctName)));
 
     //TODO: W/H in window.  bg in window (window sets surface/renderer).
-    vtkm::rendering::Window3D<vtkm::rendering::SceneRendererGL<VTKM_DEFAULT_DEVICE_ADAPTER_TAG>,
+    vtkm::rendering::Window3D<vtkm::rendering::MapperGL<VTKM_DEFAULT_DEVICE_ADAPTER_TAG>,
                               vtkm::rendering::RenderSurfaceOSMesa,
                               vtkm::rendering::WorldAnnotatorGL>
-        w(scene, sceneRenderer, surface, view, bg);
+        w(scene, mapper, surface, view, bg);
 
     w.Initialize();
     w.Paint();
@@ -131,7 +131,7 @@ void Render2D(const vtkm::cont::DataSet &ds,
 {
     const vtkm::Int32 W = 512, H = 512;
     const vtkm::cont::CoordinateSystem coords = ds.GetCoordinateSystem();
-    vtkm::rendering::SceneRendererGL<VTKM_DEFAULT_DEVICE_ADAPTER_TAG> sceneRenderer;
+    vtkm::rendering::MapperGL<VTKM_DEFAULT_DEVICE_ADAPTER_TAG> mapper;
 
     vtkm::rendering::View view;
     Set2DView(view, coords, W, H);
@@ -144,10 +144,10 @@ void Render2D(const vtkm::cont::DataSet &ds,
                                                 ds.GetCoordinateSystem(),
                                                 ds.GetField(fieldNm),
                                                 vtkm::rendering::ColorTable(ctName)));
-    vtkm::rendering::Window2D<vtkm::rendering::SceneRendererGL<VTKM_DEFAULT_DEVICE_ADAPTER_TAG>,
+    vtkm::rendering::Window2D<vtkm::rendering::MapperGL<VTKM_DEFAULT_DEVICE_ADAPTER_TAG>,
                               vtkm::rendering::RenderSurfaceOSMesa,
                               vtkm::rendering::WorldAnnotatorGL>
-        w(scene, sceneRenderer, surface, view, bg);
+        w(scene, mapper, surface, view, bg);
 
     w.Initialize();
     w.Paint();
@@ -173,7 +173,7 @@ void RenderTests()
 }
 } //namespace
 
-int UnitTestSceneRendererOSMesa(int, char *[])
+int UnitTestMapperOSMesa(int, char *[])
 {
     return vtkm::cont::testing::Testing::Run(RenderTests);
 }
diff --git a/vtkm/rendering/testing/UnitTestSceneRendererRayTracer.cxx b/vtkm/rendering/testing/UnitTestMapperRayTracer.cxx
similarity index 92%
rename from vtkm/rendering/testing/UnitTestSceneRendererRayTracer.cxx
rename to vtkm/rendering/testing/UnitTestMapperRayTracer.cxx
index bf3b89476..fe65212e1 100644
--- a/vtkm/rendering/testing/UnitTestSceneRendererRayTracer.cxx
+++ b/vtkm/rendering/testing/UnitTestMapperRayTracer.cxx
@@ -18,12 +18,12 @@
 //  this software.
 //============================================================================
 #include <vtkm/cont/testing/MakeTestDataSet.h>
-#include <vtkm/rendering/Window.h>
-#include <vtkm/rendering/RenderSurfaceRayTracer.h>
-#include <vtkm/rendering/WorldAnnotator.h>
-#include <vtkm/rendering/Scene.h>
+#include <vtkm/rendering/MapperRayTracer.h>
 #include <vtkm/rendering/Plot.h>
-#include <vtkm/rendering/SceneRendererRayTracer.h>
+#include <vtkm/rendering/RenderSurfaceRayTracer.h>
+#include <vtkm/rendering/Scene.h>
+#include <vtkm/rendering/Window.h>
+#include <vtkm/rendering/WorldAnnotator.h>
 #include <vtkm/cont/DeviceAdapter.h>
 #include <vtkm/cont/testing/Testing.h>
 
@@ -67,7 +67,7 @@ void Render(const vtkm::cont::DataSet &ds,
 {
     const vtkm::Int32 W = 512, H = 512;
     const vtkm::cont::CoordinateSystem coords = ds.GetCoordinateSystem();
-    vtkm::rendering::SceneRendererRayTracer<VTKM_DEFAULT_DEVICE_ADAPTER_TAG> sceneRenderer;
+    vtkm::rendering::MapperRayTracer<VTKM_DEFAULT_DEVICE_ADAPTER_TAG> mapper;
 
     vtkm::rendering::Camera camera;
     Set3DView(camera, coords, W, H);
@@ -81,10 +81,10 @@ void Render(const vtkm::cont::DataSet &ds,
                                                 vtkm::rendering::ColorTable(ctName)));
 
     //TODO: W/H in window.  bg in window (window sets surface/renderer).
-    vtkm::rendering::Window3D<vtkm::rendering::SceneRendererRayTracer<VTKM_DEFAULT_DEVICE_ADAPTER_TAG>,
+    vtkm::rendering::Window3D<vtkm::rendering::MapperRayTracer<VTKM_DEFAULT_DEVICE_ADAPTER_TAG>,
                               vtkm::rendering::RenderSurfaceRayTracer,
                               vtkm::rendering::WorldAnnotator>
-        w(scene, sceneRenderer, surface, camera, bg);
+        w(scene, mapper, surface, camera, bg);
 
     w.Initialize();
     w.Paint();
@@ -105,7 +105,7 @@ void RenderTests()
 }
 
 } //namespace
-int UnitTestSceneRendererRayTracer(int, char *[])
+int UnitTestMapperRayTracer(int, char *[])
 {
     return vtkm::cont::testing::Testing::Run(RenderTests);
 }
diff --git a/vtkm/rendering/testing/UnitTestSceneRendererVolume.cxx b/vtkm/rendering/testing/UnitTestMapperVolume.cxx
similarity index 92%
rename from vtkm/rendering/testing/UnitTestSceneRendererVolume.cxx
rename to vtkm/rendering/testing/UnitTestMapperVolume.cxx
index e27e44ccc..1a38ea2cd 100644
--- a/vtkm/rendering/testing/UnitTestSceneRendererVolume.cxx
+++ b/vtkm/rendering/testing/UnitTestMapperVolume.cxx
@@ -18,11 +18,11 @@
 //  this software.
 //============================================================================
 #include <vtkm/cont/testing/MakeTestDataSet.h>
+#include <vtkm/rendering/MapperVolume.h>
 #include <vtkm/rendering/Plot.h>
 #include <vtkm/rendering/RenderSurface.h>
 #include <vtkm/rendering/RenderSurfaceRayTracer.h>
 #include <vtkm/rendering/Scene.h>
-#include <vtkm/rendering/SceneRendererVolume.h>
 #include <vtkm/rendering/Window.h>
 #include <vtkm/rendering/WorldAnnotator.h>
 #include <vtkm/cont/DeviceAdapter.h>
@@ -68,7 +68,7 @@ void Render(const vtkm::cont::DataSet &ds,
 {
     const vtkm::Int32 W = 512, H = 512;
     const vtkm::cont::CoordinateSystem coords = ds.GetCoordinateSystem();
-    vtkm::rendering::SceneRendererVolume<VTKM_DEFAULT_DEVICE_ADAPTER_TAG> sceneRenderer;
+    vtkm::rendering::MapperVolume<VTKM_DEFAULT_DEVICE_ADAPTER_TAG> mapper;
 
     vtkm::rendering::Camera camera;
     Set3DView(camera, coords, W, H);
@@ -86,10 +86,10 @@ void Render(const vtkm::cont::DataSet &ds,
                                                 colorTable));
 
     //TODO: W/H in window.  bg in window (window sets surface/renderer).
-    vtkm::rendering::Window3D<vtkm::rendering::SceneRendererVolume<VTKM_DEFAULT_DEVICE_ADAPTER_TAG>,
+    vtkm::rendering::Window3D<vtkm::rendering::MapperVolume<VTKM_DEFAULT_DEVICE_ADAPTER_TAG>,
                               vtkm::rendering::RenderSurfaceRayTracer,
                               vtkm::rendering::WorldAnnotator>
-        w(scene, sceneRenderer, surface, camera, bg);
+        w(scene, mapper, surface, camera, bg);
 
     w.Initialize();
     w.Paint();
@@ -109,7 +109,7 @@ void RenderTests()
 }
 
 } //namespace
-int UnitTestSceneRendererVolume(int, char *[])
+int UnitTestMapperVolume(int, char *[])
 {
     return vtkm::cont::testing::Testing::Run(RenderTests);
 }