diff --git a/components/canvas/canvas_paint_task.rs b/components/canvas/canvas_paint_task.rs
index a5ab92a2dfe..ee71bd16483 100644
--- a/components/canvas/canvas_paint_task.rs
+++ b/components/canvas/canvas_paint_task.rs
@@ -18,17 +18,17 @@ pub enum CanvasMsg {
     Close,
 }
 
-pub struct CanvasRenderTask {
+pub struct CanvasPaintTask {
     drawtarget: DrawTarget,
     fill_color: ColorPattern,
     stroke_color: ColorPattern,
     stroke_opts: StrokeOptions,
 }
 
-impl CanvasRenderTask {
-    fn new(size: Size2D<i32>) -> CanvasRenderTask {
-        CanvasRenderTask {
-            drawtarget: CanvasRenderTask::create(size),
+impl CanvasPaintTask {
+    fn new(size: Size2D<i32>) -> CanvasPaintTask {
+        CanvasPaintTask {
+            drawtarget: CanvasPaintTask::create(size),
             fill_color: ColorPattern::new(Color::new(0., 0., 0., 1.)),
             stroke_color: ColorPattern::new(Color::new(0., 0., 0., 1.)),
             stroke_opts: StrokeOptions::new(1.0, 1.0),
@@ -38,14 +38,14 @@ impl CanvasRenderTask {
     pub fn start(size: Size2D<i32>) -> Sender<CanvasMsg> {
         let (chan, port) = comm::channel::<CanvasMsg>();
         spawn_named("CanvasTask", proc() {
-            let mut renderer = CanvasRenderTask::new(size);
+            let mut painter = CanvasPaintTask::new(size);
 
             loop {
                 match port.recv() {
-                    FillRect(ref rect) => renderer.fill_rect(rect),
-                    StrokeRect(ref rect) => renderer.stroke_rect(rect),
-                    ClearRect(ref rect) => renderer.clear_rect(rect),
-                    Recreate(size) => renderer.recreate(size),
+                    FillRect(ref rect) => painter.fill_rect(rect),
+                    StrokeRect(ref rect) => painter.stroke_rect(rect),
+                    ClearRect(ref rect) => painter.clear_rect(rect),
+                    Recreate(size) => painter.recreate(size),
                     Close => break,
                 }
             }
@@ -72,6 +72,6 @@ impl CanvasRenderTask {
     }
 
     fn recreate(&mut self, size: Size2D<i32>) {
-        self.drawtarget = CanvasRenderTask::create(size);
+        self.drawtarget = CanvasPaintTask::create(size);
     }
 }
diff --git a/components/script/dom/canvasrenderingcontext2d.rs b/components/script/dom/canvasrenderingcontext2d.rs
index eba8094c334..be9320d4b42 100644
--- a/components/script/dom/canvasrenderingcontext2d.rs
+++ b/components/script/dom/canvasrenderingcontext2d.rs
@@ -13,7 +13,7 @@ use geom::point::Point2D;
 use geom::rect::Rect;
 use geom::size::Size2D;
 
-use canvas::canvas_paint_task::{CanvasMsg, CanvasRenderTask, ClearRect, Close, FillRect, Recreate, StrokeRect};
+use canvas::canvas_paint_task::{CanvasMsg, CanvasPaintTask, ClearRect, Close, FillRect, Recreate, StrokeRect};
 
 #[dom_struct]
 pub struct CanvasRenderingContext2D {
@@ -28,7 +28,7 @@ impl CanvasRenderingContext2D {
         CanvasRenderingContext2D {
             reflector_: Reflector::new(),
             global: GlobalField::from_rooted(global),
-            renderer: CanvasRenderTask::start(size),
+            renderer: CanvasPaintTask::start(size),
             canvas: JS::from_rooted(canvas),
         }
     }