diff --git a/Makefile b/Makefile
index 521a42f47..dbc3508d1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,37 +1,40 @@
 # Config options
-ENABLE_LTO    ?= n
-ENABLE_STRIP  ?= n
+ENABLE_LTO     ?= n
+ENABLE_STRIP   ?= n
 
 # Binaries
-RUSTC         ?= rustc
-CARGO         ?= cargo
-RM            := rm
+RUSTC          ?= rustc
+CARGO          ?= cargo
+RM             := rm
 
 # Install directories
-PREFIX        ?= /usr/local
-BINDIR        ?= /bin
+PREFIX         ?= /usr/local
+BINDIR         ?= /bin
 
 # This won't support any directory with spaces in its name, but you can just
 # make a symlink without spaces that points to the directory.
-BASEDIR       ?= $(shell pwd)
-SRCDIR        := $(BASEDIR)/src
-BUILDDIR      := $(BASEDIR)/build
-TESTDIR       := $(BASEDIR)/test
-TEMPDIR       := $(BASEDIR)/tmp
+BASEDIR        ?= $(shell pwd)
+SRCDIR         := $(BASEDIR)/src
+BUILDDIR       := $(BASEDIR)/build
+TESTDIR        := $(BASEDIR)/test
+TEMPDIR        := $(BASEDIR)/tmp
 
 # Flags
-RUSTCFLAGS    := -O -L $(BUILDDIR)/
-RMFLAGS       :=
+RUSTCFLAGS     := -O
+RMFLAGS        :=
+
+RUSTCLIBFLAGS  := $(RUSTCFLAGS) -L $(BUILDDIR)/
+RUSTCTESTFLAGS := $(RUSTCFLAGS)
 
 # Handle config setup
 ifeq ($(ENABLE_LTO),y)
-RUSTCBINFLAGS := $(RUSTCFLAGS) -Z lto
+RUSTCBINFLAGS  := $(RUSTCLIBFLAGS) -Z lto
 else
-RUSTCBINFLAGS := $(RUSTCFLAGS)
+RUSTCBINFLAGS  := $(RUSTCLIBFLAGS)
 endif
 
 ifneq ($(ENABLE_STRIP),y)
-ENABLE_STRIP  :=
+ENABLE_STRIP   :=
 endif
 
 # Possible programs
@@ -170,7 +173,7 @@ $(BUILDDIR)/gen/$(1).rs: $(BUILDDIR)/mkmain
 	$(BUILDDIR)/mkmain $(1) $$@
 
 $(BUILDDIR)/$(1): $(BUILDDIR)/gen/$(1).rs $(BUILDDIR)/$($(1)_RLIB) | $(BUILDDIR) deps
-	$(RUSTC) $(RUSTCBINFLAGS) -o $$@ $$<
+	$(RUSTC) $(RUSTCBINFLAGS) --extern test=$(BUILDDIR)/libtest.rlib -o $$@ $$<
 	$(if $(ENABLE_STRIP),strip $$@,)
 endef
 
@@ -178,7 +181,7 @@ define CRATE_BUILD
 -include $(BUILDDIR)/$(1).d
 
 $(BUILDDIR)/$($(1)_RLIB): $(SRCDIR)/$(1)/$(1).rs | $(BUILDDIR) deps
-	$(RUSTC) $(RUSTCFLAGS) --extern time=$(BUILDDIR)/libtime.rlib --extern regex=$(BUILDDIR)/libregex.rlib --crate-type rlib --emit link,dep-info $$< --out-dir $(BUILDDIR)
+	$(RUSTC) $(RUSTCLIBFLAGS) --extern time=$(BUILDDIR)/libtime.rlib --extern regex=$(BUILDDIR)/libregex.rlib --crate-type rlib --emit link,dep-info $$< --out-dir $(BUILDDIR)
 endef
 
 # Aliases build rule
@@ -200,7 +203,7 @@ test_$(1): $(TEMPDIR)/$(1)/$(1)_test $(BUILDDIR)/$(1)
 	$(call command,cp $(BUILDDIR)/$(1) $(TEMPDIR)/$(1) && cd $(TEMPDIR)/$(1) && $$<)
 
 $(TEMPDIR)/$(1)/$(1)_test: $(TESTDIR)/$(1).rs | $(TEMPDIR)/$(1)
-	$(call command,$(RUSTC) $(RUSTCFLAGS) --extern time=$(BUILDDIR)/libtime.rlib --extern regex=$(BUILDDIR)/libregex.rlib --test -o $$@ $$<)
+	$(call command,$(RUSTC) $(RUSTCTESTFLAGS) --extern time=$(BUILDDIR)/libtime.rlib --extern regex=$(BUILDDIR)/libregex.rlib --test -o $$@ $$<)
 
 $(TEMPDIR)/$(1): | $(TEMPDIR)
 	$(call command,cp -r $(TESTDIR)/fixtures/$(1) $$@ || mkdir $$@)
@@ -218,7 +221,7 @@ $(foreach test,$(TESTS),$(eval $(call TEST_BUILD,$(test))))
 -include $(BUILDDIR)/uutils.d
 $(BUILDDIR)/uutils: $(SRCDIR)/uutils/uutils.rs $(BUILDDIR)/mkuutils $(RLIB_PATHS)
 	$(BUILDDIR)/mkuutils $(BUILDDIR)/gen/uutils.rs $(EXES)
-	$(RUSTC) $(RUSTCBINFLAGS) --emit link,dep-info $(BUILDDIR)/gen/uutils.rs -o $@
+	$(RUSTC) $(RUSTCBINFLAGS) --extern test=$(BUILDDIR)/libtest.rlib --emit link,dep-info $(BUILDDIR)/gen/uutils.rs --out-dir $(BUILDDIR)
 	$(if $(ENABLE_STRIP),strip $@)
 
 # Dependencies
@@ -229,12 +232,12 @@ $(BUILDDIR)/.rust-crypto: | $(BUILDDIR)
 	cp -r $(BASEDIR)/deps/rust-crypto/target/release/libcrypto*.rlib $(BUILDDIR)/libcrypto.rlib
 	@touch $@
 
-#$(BUILDDIR)/.rust-time:
+#$(BUILDDIR)/.rust-time: | $(BUILDDIR)
 #	cd $(BASEDIR)/deps/time && $(CARGO) build --release
 #	cp -r $(BASEDIR)/deps/time/target/release/libtime*.rlib $(BUILDDIR)/libtime.rlib
 #	@touch $@
 
-$(BUILDDIR)/.rust-regex:
+$(BUILDDIR)/.rust-regex: | $(BUILDDIR)
 	cd $(BASEDIR)/deps/regex/regex_macros && $(CARGO) build --release
 	cp -r $(BASEDIR)/deps/regex/regex_macros/target/release/libregex_macros* $(BUILDDIR)
 	cp -r $(BASEDIR)/deps/regex/regex_macros/target/release/deps/libregex*.rlib $(BUILDDIR)/libregex.rlib
@@ -247,7 +250,7 @@ $(BUILDDIR)/mkuutils: mkuutils.rs | $(BUILDDIR)
 	$(RUSTC) $(RUSTCFLAGS) $< -o $@
 
 $(SRCDIR)/cksum/crc_table.rs: $(SRCDIR)/cksum/gen_table.rs
-	cd $(SRCDIR)/cksum && $(RUSTC) $(RUSTCFLAGS) gen_table.rs && ./gen_table && $(RM) gen_table
+	cd $(SRCDIR)/cksum && $(RUSTC) $(RUSTCBINFLAGS) gen_table.rs && ./gen_table && $(RM) gen_table
 
 deps: $(BUILDDIR)/.rust-crypto $(BUILDDIR)/.rust-regex $(SRCDIR)/cksum/crc_table.rs
 
diff --git a/mkmain.rs b/mkmain.rs
index 54efa3654..612d07b98 100644
--- a/mkmain.rs
+++ b/mkmain.rs
@@ -6,10 +6,10 @@ use std::path::Path;
 
 static TEMPLATE: &'static str = "\
 #![allow(unstable)]
-extern crate @UTIL_CRATE@;
+extern crate \"@UTIL_CRATE@\" as uu@UTIL_CRATE@;
 
 use std::os;
-use @UTIL_CRATE@::uumain;
+use uu@UTIL_CRATE@::uumain;
 
 fn main() {
     os::set_exit_status(uumain(os::args()));
@@ -24,14 +24,8 @@ fn main() {
         return;
     }
 
-    let crat = match args[1].as_slice() {
-        "test" => "uutest",
-        "true" => "uutrue",
-        "false" => "uufalse",
-        "sync" => "uusync",
-        s => s.clone(),
-    };
-    let outfile  = args[2].as_slice();
+    let crat    = args[1].as_slice();
+    let outfile = args[2].as_slice();
 
     let main = TEMPLATE.replace("@UTIL_CRATE@", crat);
     let mut out = File::open_mode(&Path::new(outfile), Truncate, ReadWrite);
diff --git a/mkuutils.rs b/mkuutils.rs
index c886f16d7..7a486020f 100644
--- a/mkuutils.rs
+++ b/mkuutils.rs
@@ -30,19 +30,11 @@ fn main() {
                     hashsum = true;
                 }
             }
-            "test" => {
-                crates.push_str("extern crate uutest;\n");
-                util_map.push_str("map.insert(\"test\", uutest::uumain);\n");
-            }
             "true" => util_map.push_str("fn uutrue(_: Vec<String>) -> isize { 0 }\nmap.insert(\"true\", uutrue);\n"),
             "false" => util_map.push_str("fn uufalse(_: Vec<String>) -> isize { 1 }\nmap.insert(\"false\", uufalse);\n"),
-            "sync" => {
-                crates.push_str("extern crate uusync;\n");
-                util_map.push_str("map.insert(\"sync\", uusync::uumain);\n");
-            }
             _ => {
-                crates.push_str(format!("extern crate {};\n", prog).as_slice());
-                util_map.push_str(format!("map.insert(\"{prog}\", {prog}::uumain as fn(Vec<String>) -> isize);\n", prog = prog).as_slice());
+                crates.push_str(format!("extern crate \"{0}\" as uu{0};\n", prog).as_slice());
+                util_map.push_str(format!("map.insert(\"{prog}\", uu{prog}::uumain as fn(Vec<String>) -> isize);\n", prog = prog).as_slice());
             }
         }
     }
diff --git a/src/false/false.rs b/src/false/false.rs
index abb81295c..48f937079 100644
--- a/src/false/false.rs
+++ b/src/false/false.rs
@@ -1,4 +1,4 @@
-#![crate_name = "uufalse"]
+#![crate_name = "false"]
 #![allow(unstable)]
 
 /*
diff --git a/src/sync/sync.rs b/src/sync/sync.rs
index 8d5ad739e..0f25d8b76 100644
--- a/src/sync/sync.rs
+++ b/src/sync/sync.rs
@@ -1,4 +1,4 @@
-#![crate_name = "uusync"]
+#![crate_name = "sync"]
 #![allow(unstable)]
 
 /*
@@ -163,7 +163,7 @@ pub fn uumain(args: Vec<String>) -> isize {
         return 0
     }
 
-    uusync();
+    sync();
     0
 }
 
@@ -179,7 +179,7 @@ fn help(program: &str, options: &[getopts::OptGroup]) {
     print!("{}", usage("Force changed blocks to disk, update the super block.", options));
 }
 
-fn uusync() -> isize {
+fn sync() -> isize {
     unsafe {
         platform::do_sync()
     }
diff --git a/src/test/test.rs b/src/test/test.rs
index 530d9369c..605703e1e 100644
--- a/src/test/test.rs
+++ b/src/test/test.rs
@@ -1,4 +1,4 @@
-#![crate_name = "uutest"]
+#![crate_name = "test"]
 #![allow(unstable)]
 
 /*
diff --git a/src/true/true.rs b/src/true/true.rs
index fa4216ee8..7818801fc 100644
--- a/src/true/true.rs
+++ b/src/true/true.rs
@@ -1,4 +1,4 @@
-#![crate_name= "uutrue"]
+#![crate_name= "true"]
 #![allow(unstable)]
 
 /*