diff --git a/components/compositing/constellation.rs b/components/compositing/constellation.rs
index 07c1faea6dd..4b704ce783a 100644
--- a/components/compositing/constellation.rs
+++ b/components/compositing/constellation.rs
@@ -7,7 +7,7 @@ use pipeline::{Pipeline, CompositionPipeline};
 use compositor_task::CompositorProxy;
 use compositor_task::Msg as CompositorMsg;
 use devtools_traits;
-use devtools_traits::DevtoolsControlChan;
+use devtools_traits::{DevtoolsControlChan, DevtoolsControlMsg};
 use geom::rect::{Rect, TypedRect};
 use geom::scale_factor::ScaleFactor;
 use gfx::font_cache_task::FontCacheTask;
@@ -521,7 +521,7 @@ impl<LTF: LayoutTaskFactory, STF: ScriptTaskFactory> Constellation<LTF, STF> {
         self.image_cache_task.exit();
         self.resource_task.send(resource_task::ControlMsg::Exit).unwrap();
         self.devtools_chan.as_ref().map(|chan| {
-            chan.send(devtools_traits::ServerExitMsg).unwrap();
+            chan.send(DevtoolsControlMsg::ServerExitMsg).unwrap();
         });
         self.storage_task.send(StorageTaskMsg::Exit).unwrap();
         self.font_cache_task.exit();
diff --git a/components/devtools/lib.rs b/components/devtools/lib.rs
index 759937c6354..16d973e90b4 100644
--- a/components/devtools/lib.rs
+++ b/components/devtools/lib.rs
@@ -35,8 +35,8 @@ use actors::root::RootActor;
 use actors::tab::TabActor;
 use protocol::JsonPacketStream;
 
-use devtools_traits::{ServerExitMsg, DevtoolsControlMsg, NewGlobal, DevtoolScriptControlMsg};
-use devtools_traits::{DevtoolsPageInfo, SendConsoleMessage, ConsoleMessage};
+use devtools_traits::{ConsoleMessage, DevtoolsControlMsg};
+use devtools_traits::{DevtoolsPageInfo, DevtoolScriptControlMsg};
 use msg::constellation_msg::PipelineId;
 use util::task::spawn_named;
 
@@ -231,11 +231,11 @@ fn run_server(receiver: Receiver<DevtoolsControlMsg>, port: u16) {
         match acceptor.accept() {
             Err(ref e) if e.kind == TimedOut => {
                 match receiver.try_recv() {
-                    Ok(ServerExitMsg) | Err(Disconnected) => break,
-                    Ok(NewGlobal(id, sender, pageinfo)) =>
+                    Ok(DevtoolsControlMsg::ServerExitMsg) | Err(Disconnected) => break,
+                    Ok(DevtoolsControlMsg::NewGlobal(id, sender, pageinfo)) =>
                         handle_new_global(actors.clone(), id,sender, &mut actor_pipelines,
                                           pageinfo),
-                    Ok(SendConsoleMessage(id, console_message)) =>
+                    Ok(DevtoolsControlMsg::SendConsoleMessage(id, console_message)) =>
                         handle_console_message(actors.clone(), id, console_message,
                                                &actor_pipelines),
                     Err(Empty) => acceptor.set_timeout(Some(POLL_TIMEOUT)),
diff --git a/components/devtools_traits/lib.rs b/components/devtools_traits/lib.rs
index 349452bc40f..b066d786454 100644
--- a/components/devtools_traits/lib.rs
+++ b/components/devtools_traits/lib.rs
@@ -20,7 +20,6 @@ extern crate "serialize" as rustc_serialize;
 extern crate url;
 extern crate util;
 
-pub use self::DevtoolsControlMsg::*;
 pub use self::DevtoolScriptControlMsg::*;
 pub use self::EvaluateJSReply::*;
 
diff --git a/components/script/dom/console.rs b/components/script/dom/console.rs
index cff30395d2a..4dec1c3bd45 100644
--- a/components/script/dom/console.rs
+++ b/components/script/dom/console.rs
@@ -7,7 +7,7 @@ use dom::bindings::codegen::Bindings::ConsoleBinding::ConsoleMethods;
 use dom::bindings::global::{GlobalRef, GlobalField};
 use dom::bindings::js::{JSRef, Temporary};
 use dom::bindings::utils::{Reflector, reflect_dom_object};
-use devtools_traits::{SendConsoleMessage, ConsoleMessage};
+use devtools_traits::{DevtoolsControlMsg, ConsoleMessage};
 use util::str::DOMString;
 
 #[dom_struct]
@@ -68,7 +68,8 @@ fn propagate_console_msg(console: &JSRef<Console>, console_message: ConsoleMessa
         GlobalRef::Window(window_ref) => {
             let pipelineId = window_ref.page().id;
             console.global.root().r().as_window().page().devtools_chan.as_ref().map(|chan| {
-                chan.send(SendConsoleMessage(pipelineId, console_message.clone())).unwrap();
+                chan.send(DevtoolsControlMsg::SendConsoleMessage(
+                    pipelineId, console_message.clone())).unwrap();
             });
         },
 
diff --git a/components/script/script_task.rs b/components/script/script_task.rs
index 7e9269442e1..b28fcc95bff 100644
--- a/components/script/script_task.rs
+++ b/components/script/script_task.rs
@@ -41,8 +41,8 @@ use page::{Page, IterablePage, Frame};
 use timers::TimerId;
 use devtools;
 
-use devtools_traits::{DevtoolsControlChan, DevtoolsControlPort, NewGlobal, GetRootNode, DevtoolsPageInfo};
-use devtools_traits::{DevtoolScriptControlMsg, EvaluateJS, GetDocumentElement};
+use devtools_traits::{DevtoolsControlChan, DevtoolsControlPort, GetRootNode, DevtoolsPageInfo};
+use devtools_traits::{DevtoolsControlMsg, DevtoolScriptControlMsg, EvaluateJS, GetDocumentElement};
 use devtools_traits::{GetChildren, GetLayout, ModifyAttribute, WantsLiveNotifications};
 use script_traits::CompositorEvent;
 use script_traits::CompositorEvent::{ResizeEvent, ReflowEvent, ClickEvent};
@@ -947,8 +947,9 @@ impl ScriptTask {
                     title: document.r().Title(),
                     url: final_url
                 };
-                chan.send(NewGlobal(pipeline_id, self.devtools_sender.clone(),
-                                    page_info)).unwrap();
+                chan.send(DevtoolsControlMsg::NewGlobal(pipeline_id,
+                                                        self.devtools_sender.clone(),
+                                                        page_info)).unwrap();
             }
         }
     }