diff --git a/src/librustc/driver/driver.rs b/src/librustc/driver/driver.rs
index 33c70a3d425..837d3c285aa 100644
--- a/src/librustc/driver/driver.rs
+++ b/src/librustc/driver/driver.rs
@@ -198,8 +198,8 @@ pub fn compile_rest(sess: Session,
     crate = time(time_passes, ~"intrinsic injection", ||
         front::intrinsic_inject::inject_intrinsic(sess, crate));
 
-    crate = time(time_passes, ~"core injection", ||
-        front::core_inject::maybe_inject_libcore_ref(sess, crate));
+    crate = time(time_passes, ~"std injection", ||
+        front::std_inject::maybe_inject_libstd_ref(sess, crate));
 
     let ast_map = time(time_passes, ~"ast indexing", ||
             syntax::ast_map::map_crate(sess.diagnostic(), crate));
diff --git a/src/librustc/front/core_inject.rs b/src/librustc/front/std_inject.rs
similarity index 85%
rename from src/librustc/front/core_inject.rs
rename to src/librustc/front/std_inject.rs
index b3e045d8af9..e84f552fd1c 100644
--- a/src/librustc/front/core_inject.rs
+++ b/src/librustc/front/std_inject.rs
@@ -16,23 +16,22 @@ use syntax::codemap;
 use syntax::codemap::dummy_sp;
 use syntax::fold;
 
-static CORE_VERSION: &'static str = "0.7-pre";
+static STD_VERSION: &'static str = "0.7-pre";
 
-pub fn maybe_inject_libcore_ref(sess: Session,
-                                crate: @ast::crate) -> @ast::crate {
-    if use_core(crate) {
-        inject_libcore_ref(sess, crate)
+pub fn maybe_inject_libstd_ref(sess: Session, crate: @ast::crate)
+                               -> @ast::crate {
+    if use_std(crate) {
+        inject_libstd_ref(sess, crate)
     } else {
         crate
     }
 }
 
-fn use_core(crate: @ast::crate) -> bool {
-    !attr::attrs_contains_name(crate.node.attrs, "no_core")
+fn use_std(crate: @ast::crate) -> bool {
+    !attr::attrs_contains_name(crate.node.attrs, "no_std")
 }
 
-fn inject_libcore_ref(sess: Session,
-                      crate: @ast::crate) -> @ast::crate {
+fn inject_libstd_ref(sess: Session, crate: @ast::crate) -> @ast::crate {
     fn spanned<T:Copy>(x: T) -> codemap::spanned<T> {
         codemap::spanned { node: x, span: dummy_sp() }
     }
@@ -48,7 +47,7 @@ fn inject_libcore_ref(sess: Session,
                         style: ast::attr_inner,
                         value: @spanned(ast::meta_name_value(
                             @~"vers",
-                            spanned(ast::lit_str(@CORE_VERSION.to_str()))
+                            spanned(ast::lit_str(@STD_VERSION.to_str()))
                         )),
                         is_sugared_doc: false
                     })
diff --git a/src/librustc/rustc.rc b/src/librustc/rustc.rc
index 310b0c964ee..a21c5dc7b36 100644
--- a/src/librustc/rustc.rc
+++ b/src/librustc/rustc.rc
@@ -102,7 +102,7 @@ pub mod middle {
 pub mod front {
     pub mod config;
     pub mod test;
-    pub mod core_inject;
+    pub mod std_inject;
     pub mod intrinsic_inject;
 }
 
diff --git a/src/libstd/core.rc b/src/libstd/core.rc
index 60093ff96bb..6f4890c7834 100644
--- a/src/libstd/core.rc
+++ b/src/libstd/core.rc
@@ -57,8 +57,9 @@ they contained the following prologue:
 #[crate_type = "lib"];
 
 
-// Don't link to core. We are core.
-#[no_core];
+// Don't link to std. We are std.
+#[no_core]; // for stage0
+#[no_std];
 
 #[deny(non_camel_case_types)];
 
diff --git a/src/test/compile-fail/tag-that-dare-not-speak-its-name.rs b/src/test/compile-fail/tag-that-dare-not-speak-its-name.rs
index 22f6a34a181..f167ee3d5c4 100644
--- a/src/test/compile-fail/tag-that-dare-not-speak-its-name.rs
+++ b/src/test/compile-fail/tag-that-dare-not-speak-its-name.rs
@@ -11,7 +11,7 @@
 // error-pattern:mismatched types: expected `char` but found
 // Issue #876
 
-#[no_core];
+#[no_std];
 
 extern mod core;
 
diff --git a/src/test/run-pass/trait-to-str.rs b/src/test/run-pass/trait-to-str.rs
index ca22b5942db..9726eed5804 100644
--- a/src/test/run-pass/trait-to-str.rs
+++ b/src/test/run-pass/trait-to-str.rs
@@ -10,7 +10,7 @@
 
 // xfail-fast
 
-#[no_core];
+#[no_std];
 
 extern mod core;
 
diff --git a/src/test/run-pass/use.rs b/src/test/run-pass/use.rs
index 0bd4175d390..11f9e7641e1 100644
--- a/src/test/run-pass/use.rs
+++ b/src/test/run-pass/use.rs
@@ -10,7 +10,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[no_core];
+#[no_std];
 extern mod core;
 extern mod zed(name = "core");
 extern mod bar(name = "core", vers = "0.7-pre");