diff --git a/collects/compiler/bundle-dist.ss b/collects/compiler/bundle-dist.ss
index b0e91479c6..02a671be4f 100644
--- a/collects/compiler/bundle-dist.ss
+++ b/collects/compiler/bundle-dist.ss
@@ -1,10 +1,10 @@
 
 (module bundle-dist mzscheme
-  (require (lib "etc.ss")
-	   (lib "file.ss")
-	   (lib "process.ss")
-	   (lib "zip.ss")
-	   (lib "tar.ss"))
+  (require mzlib/etc
+	   mzlib/file
+	   mzlib/process
+	   mzlib/zip
+	   mzlib/tar)
 
   (provide bundle-put-file-extension+style+filters
 	   bundle-directory)
diff --git a/collects/compiler/embed-sig.ss b/collects/compiler/embed-sig.ss
index dede40321b..a5e949c9a8 100644
--- a/collects/compiler/embed-sig.ss
+++ b/collects/compiler/embed-sig.ss
@@ -1,6 +1,6 @@
 
 (module embed-sig mzscheme
-  (require (lib "unit.ss"))
+  (require mzlib/unit)
   (provide compiler:embed^)
 
   (define-signature compiler:embed^
diff --git a/collects/compiler/sig.ss b/collects/compiler/sig.ss
index b8f638779f..b9577b6fa7 100644
--- a/collects/compiler/sig.ss
+++ b/collects/compiler/sig.ss
@@ -1,7 +1,7 @@
 
 (module sig mzscheme
 
-  (require (lib "unit.ss"))
+  (require mzlib/unit)
 
   (provide compiler:option^
 	   compiler^
diff --git a/collects/setup/option-sig.ss b/collects/setup/option-sig.ss
index 1285a76453..0bbdfe9b19 100644
--- a/collects/setup/option-sig.ss
+++ b/collects/setup/option-sig.ss
@@ -1,6 +1,6 @@
 
 (module option-sig mzscheme
-  (require (lib "unit.ss"))
+  (require mzlib/unit)
   
   (provide setup-option^)
 
diff --git a/collects/tests/mzscheme/embed-me2.ss b/collects/tests/mzscheme/embed-me2.ss
index f0216b0381..53abb21299 100644
--- a/collects/tests/mzscheme/embed-me2.ss
+++ b/collects/tests/mzscheme/embed-me2.ss
@@ -1,6 +1,6 @@
 (module embed-me2 mzscheme
   (require "embed-me1.ss"
-	   (lib "etc.ss"))
+	   mzlib/etc)
   (with-output-to-file "stdout"
     (lambda () (printf "This is 2: ~a~n" true))
     'append))
diff --git a/collects/tests/mzscheme/embed-me3.ss b/collects/tests/mzscheme/embed-me3.ss
index a68cf78d4a..247292131a 100644
--- a/collects/tests/mzscheme/embed-me3.ss
+++ b/collects/tests/mzscheme/embed-me3.ss
@@ -1,5 +1,5 @@
 (module embed-me3 mzscheme
-  (require (lib "etc.ss"))
+  (require mzlib/etc)
   (with-output-to-file "stdout"
     (lambda () 
       (printf "3 is here, too? ~a\n" true))
diff --git a/collects/tests/mzscheme/embed-me5.ss b/collects/tests/mzscheme/embed-me5.ss
index aaf471f21f..23c1fbe875 100644
--- a/collects/tests/mzscheme/embed-me5.ss
+++ b/collects/tests/mzscheme/embed-me5.ss
@@ -1,5 +1,5 @@
 (module embed-me5 mzscheme
-  (require (lib "mred.ss" "mred"))
+  (require mred)
   (with-output-to-file "stdout"
     (lambda () (printf "This is 5: ~s\n" button%))
     'append))
diff --git a/collects/tests/mzscheme/embed.ss b/collects/tests/mzscheme/embed.ss
index 191d4baffd..a86b85b7ab 100644
--- a/collects/tests/mzscheme/embed.ss
+++ b/collects/tests/mzscheme/embed.ss
@@ -3,10 +3,10 @@
 
 (Section 'embed)
 
-(require (lib "embed.ss" "compiler")
-         (lib "file.ss")
-	 (lib "process.ss")
-         (lib "distribute.ss" "compiler"))
+(require compiler/embed
+         mzlib/file
+	 mzlib/process
+         compiler/distribute)
 
 (define (mk-dest-bin mred?)
   (case (system-type)
@@ -220,8 +220,8 @@
   (try-exe mr-dest "This is 5: #<class:button%>\n" #t))
 
 ;; Try the mzc interface:
-(require (lib "dirs.ss" "setup")
-	 (lib "file.ss"))
+(require setup/dirs
+	 mzlib/file)
 (define mzc (build-path (find-console-bin-dir) (if (eq? 'windows (system-type))
                                                    "mzc.exe"
                                                    "mzc")))
@@ -283,7 +283,7 @@
 (mzc-tests #t)
 |#
 
-(require (lib "file.ss" "dynext"))
+(require dynext/file)
 (define (extension-test mred?)
   (parameterize ([current-directory (find-system-path 'temp-dir)])