diff --git a/src/libstd/thread/mod.rs b/src/libstd/thread/mod.rs
index f893ae243bbb6..0e5fee27ffe22 100644
--- a/src/libstd/thread/mod.rs
+++ b/src/libstd/thread/mod.rs
@@ -187,7 +187,7 @@ use time::Duration;
 ////////////////////////////////////////////////////////////////////////////////
 
 #[macro_use] mod local;
-#[macro_use] mod scoped;
+#[macro_use] mod scoped_tls;
 
 #[stable(feature = "rust1", since = "1.0.0")]
 pub use self::local::{LocalKey, LocalKeyState};
@@ -195,10 +195,10 @@ pub use self::local::{LocalKey, LocalKeyState};
 #[unstable(feature = "scoped_tls",
             reason = "scoped TLS has yet to have wide enough use to fully \
                       consider stabilizing its interface")]
-pub use self::scoped::ScopedKey;
+pub use self::scoped_tls::ScopedKey;
 
 #[doc(hidden)] pub use self::local::__impl as __local;
-#[doc(hidden)] pub use self::scoped::__impl as __scoped;
+#[doc(hidden)] pub use self::scoped_tls::__impl as __scoped;
 
 ////////////////////////////////////////////////////////////////////////////////
 // Builder
diff --git a/src/libstd/thread/scoped.rs b/src/libstd/thread/scoped_tls.rs
similarity index 100%
rename from src/libstd/thread/scoped.rs
rename to src/libstd/thread/scoped_tls.rs