diff --git a/src/components/main/compositing/run.rs b/src/components/main/compositing/compositor.rs
similarity index 100%
rename from src/components/main/compositing/run.rs
rename to src/components/main/compositing/compositor.rs
diff --git a/src/components/main/compositing/compositor_task.rs b/src/components/main/compositing/compositor_task.rs
index 3ed53a47e40..5cdf310ce59 100644
--- a/src/components/main/compositing/compositor_task.rs
+++ b/src/components/main/compositing/compositor_task.rs
@@ -28,8 +28,8 @@ use azure::azure_hl;
 mod quadtree;
 mod compositor_layer;
 
-mod run;
-mod run_headless;
+mod compositor;
+mod headless;
 
 /// The implementation of the layers-based compositor.
 #[deriving(Clone)]
@@ -190,15 +190,15 @@ impl CompositorTask {
 
         match compositor.mode {
             Windowed(ref app) => {
-                run::IOCompositor::create(app,
-                                          opts,
-                                          port,
-                                          constellation_chan.clone(),
-                                          profiler_chan);
+                compositor::IOCompositor::create(app,
+                                                 opts,
+                                                 port,
+                                                 constellation_chan.clone(),
+                                                 profiler_chan);
             }
             Headless => {
-                run_headless::NullCompositor::create(port,
-                                                     constellation_chan.clone());
+                headless::NullCompositor::create(port,
+                                                 constellation_chan.clone());
             }
         }
 
diff --git a/src/components/main/compositing/run_headless.rs b/src/components/main/compositing/headless.rs
similarity index 100%
rename from src/components/main/compositing/run_headless.rs
rename to src/components/main/compositing/headless.rs