diff --git a/src/servo/gfx/compositor.rs b/src/servo/gfx/renderer.rs
similarity index 97%
rename from src/servo/gfx/compositor.rs
rename to src/servo/gfx/renderer.rs
index 09037e7f3ad..b8bcf0de7f3 100644
--- a/src/servo/gfx/compositor.rs
+++ b/src/servo/gfx/renderer.rs
@@ -8,7 +8,7 @@ enum msg {
     exit(comm::chan<()>)
 }
 
-fn compositor(osmain_ch: comm::chan<osmain::msg>) -> comm::chan<msg> {
+fn renderer(osmain_ch: comm::chan<osmain::msg>) -> comm::chan<msg> {
     task::spawn_listener {|po|
         let draw_target_po = comm::port();
         comm::send(osmain_ch, osmain::get_draw_target(comm::chan(draw_target_po)));
diff --git a/src/servo/input.rs b/src/servo/input.rs
index fa27056bc01..b87a0ee9fbc 100644
--- a/src/servo/input.rs
+++ b/src/servo/input.rs
@@ -1,6 +1,6 @@
 fn input(
     osmain_ch: comm::chan<osmain::msg>,
-    draw_ch: comm::chan<gfx::compositor::msg>,
+    draw_ch: comm::chan<gfx::renderer::msg>,
     model_ch: comm::chan<()>
 ) {
     task::spawn {||
@@ -11,7 +11,7 @@ fn input(
               _ {
                 comm::send(model_ch, ());
                 let draw_exit_confirm_po = comm::port();
-                comm::send(draw_ch, gfx::compositor::exit(comm::chan(draw_exit_confirm_po)));
+                comm::send(draw_ch, gfx::renderer::exit(comm::chan(draw_exit_confirm_po)));
                 comm::recv(draw_exit_confirm_po);
                 comm::send(osmain_ch, osmain::exit);
                 break;
diff --git a/src/servo/servo.rc b/src/servo/servo.rc
index 5a2f3dbecc4..9688be64eb8 100755
--- a/src/servo/servo.rc
+++ b/src/servo/servo.rc
@@ -18,7 +18,7 @@ mod dom {
 mod gfx {
     mod geom;
     mod surface;
-    mod compositor;
+    mod renderer;
 }
 
 mod image {
diff --git a/src/servo/servo.rs b/src/servo/servo.rs
index 3f250996537..3ec449cbaf6 100644
--- a/src/servo/servo.rs
+++ b/src/servo/servo.rs
@@ -9,7 +9,7 @@ fn main() {
     let osmain_ch = osmain::osmain();
 
     // The compositor
-    let draw_ch = gfx::compositor::compositor(osmain_ch);
+    let renderer = gfx::renderer::renderer(osmain_ch);
 
     // Not sure what this is but it decides what to draw
     let model_ch = task::spawn_listener {|po|
@@ -27,7 +27,7 @@ fn main() {
                 x1: x1, y1: y1, w1: w1, h1: h1,
                 x2: x2, y2: y2, w2: w2, h2: h2
             };
-            comm::send(draw_ch, gfx::compositor::draw(model));
+            comm::send(renderer, gfx::renderer::draw(model));
 
             std::timer::sleep(100u);
 
@@ -43,5 +43,5 @@ fn main() {
     };
 
     // The keyboard handler
-    input::input(osmain_ch, draw_ch, model_ch);
+    input::input(osmain_ch, renderer, model_ch);
 }
\ No newline at end of file