diff --git a/Makefile.in b/Makefile.in
index 65147b5e4eb..b927c805220 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -280,7 +280,7 @@ $(foreach target,$(CFG_TARGET),\
 # Standard library variables
 ######################################################################
 
-STDLIB_CRATE := $(S)src/libstd/std.rs
+STDLIB_CRATE := $(S)src/libstd/lib.rs
 STDLIB_INPUTS := $(wildcard $(addprefix $(S)src/libstd/,        \
                                            *.rs */*.rs */*/*rs */*/*/*rs))
 
@@ -288,7 +288,7 @@ STDLIB_INPUTS := $(wildcard $(addprefix $(S)src/libstd/,        \
 # Extra library variables
 ######################################################################
 
-EXTRALIB_CRATE := $(S)src/libextra/extra.rs
+EXTRALIB_CRATE := $(S)src/libextra/lib.rs
 EXTRALIB_INPUTS := $(wildcard $(addprefix $(S)src/libextra/,          \
                                           *.rs */*.rs))
 
@@ -296,7 +296,7 @@ EXTRALIB_INPUTS := $(wildcard $(addprefix $(S)src/libextra/,          \
 # Rust UV library variables
 ######################################################################
 
-LIBRUSTUV_CRATE := $(S)src/librustuv/rustuv.rs
+LIBRUSTUV_CRATE := $(S)src/librustuv/lib.rs
 LIBRUSTUV_INPUTS := $(wildcard $(addprefix $(S)src/librustuv/,          \
                                           *.rs */*.rs))
 
@@ -304,11 +304,11 @@ LIBRUSTUV_INPUTS := $(wildcard $(addprefix $(S)src/librustuv/,          \
 # rustc crate variables
 ######################################################################
 
-COMPILER_CRATE := $(S)src/librustc/rustc.rs
+COMPILER_CRATE := $(S)src/librustc/lib.rs
 COMPILER_INPUTS := $(wildcard $(addprefix $(S)src/librustc/,      \
                            *.rs */*.rs */*/*.rs */*/*/*.rs))
 
-LIBSYNTAX_CRATE := $(S)src/libsyntax/syntax.rs
+LIBSYNTAX_CRATE := $(S)src/libsyntax/lib.rs
 LIBSYNTAX_INPUTS := $(wildcard $(addprefix $(S)src/libsyntax/, \
                            *.rs */*.rs */*/*.rs */*/*/*.rs))
 
diff --git a/mk/tools.mk b/mk/tools.mk
index fb2e0b6367c..5ae33cb7fab 100644
--- a/mk/tools.mk
+++ b/mk/tools.mk
@@ -16,11 +16,11 @@ COMPILETEST_CRATE := $(S)src/compiletest/compiletest.rs
 COMPILETEST_INPUTS := $(wildcard $(S)src/compiletest/*.rs)
 
 # Rustpkg, the package manager and build system
-RUSTPKG_LIB := $(S)src/librustpkg/rustpkg.rs
+RUSTPKG_LIB := $(S)src/librustpkg/lib.rs
 RUSTPKG_INPUTS := $(wildcard $(S)src/librustpkg/*.rs)
 
 # Rustdoc, the documentation tool
-RUSTDOC_LIB := $(S)src/librustdoc/rustdoc.rs
+RUSTDOC_LIB := $(S)src/librustdoc/lib.rs
 RUSTDOC_INPUTS := $(wildcard $(addprefix $(S)src/librustdoc/,        \
                                            *.rs */*.rs */*/*.rs))
 
diff --git a/src/libextra/extra.rs b/src/libextra/lib.rs
similarity index 98%
rename from src/libextra/extra.rs
rename to src/libextra/lib.rs
index 0e3b8a07127..2ac12373794 100644
--- a/src/libextra/extra.rs
+++ b/src/libextra/lib.rs
@@ -98,7 +98,6 @@ pub mod uuid;
 #[cfg(unicode)]
 mod unicode;
 
-#[path="terminfo/terminfo.rs"]
 pub mod terminfo;
 
 // Compiler support modules
diff --git a/src/libextra/terminfo/terminfo.rs b/src/libextra/terminfo/mod.rs
similarity index 100%
rename from src/libextra/terminfo/terminfo.rs
rename to src/libextra/terminfo/mod.rs
diff --git a/src/librustc/rustc.rs b/src/librustc/lib.rs
similarity index 100%
rename from src/librustc/rustc.rs
rename to src/librustc/lib.rs
diff --git a/src/librustdoc/rustdoc.rs b/src/librustdoc/lib.rs
similarity index 100%
rename from src/librustdoc/rustdoc.rs
rename to src/librustdoc/lib.rs
diff --git a/src/librustpkg/rustpkg.rs b/src/librustpkg/lib.rs
similarity index 100%
rename from src/librustpkg/rustpkg.rs
rename to src/librustpkg/lib.rs
diff --git a/src/librustuv/rustuv.rs b/src/librustuv/lib.rs
similarity index 100%
rename from src/librustuv/rustuv.rs
rename to src/librustuv/lib.rs
diff --git a/src/libstd/str/ascii.rs b/src/libstd/ascii.rs
similarity index 100%
rename from src/libstd/str/ascii.rs
rename to src/libstd/ascii.rs
diff --git a/src/libstd/std.rs b/src/libstd/lib.rs
similarity index 99%
rename from src/libstd/std.rs
rename to src/libstd/lib.rs
index 4500bae4c90..68f13dc8992 100644
--- a/src/libstd/std.rs
+++ b/src/libstd/lib.rs
@@ -122,7 +122,6 @@ pub mod vec;
 pub mod at_vec;
 pub mod str;
 
-#[path = "str/ascii.rs"]
 pub mod ascii;
 pub mod send_str;
 
@@ -143,7 +142,6 @@ pub mod rc;
 /* Common traits */
 
 pub mod from_str;
-#[path = "num/num.rs"]
 pub mod num;
 pub mod iter;
 pub mod to_str;
diff --git a/src/libstd/num/num.rs b/src/libstd/num/mod.rs
similarity index 100%
rename from src/libstd/num/num.rs
rename to src/libstd/num/mod.rs
diff --git a/src/libsyntax/syntax.rs b/src/libsyntax/lib.rs
similarity index 100%
rename from src/libsyntax/syntax.rs
rename to src/libsyntax/lib.rs