diff --git a/collects/algol60/cfg-parser.ss b/collects/algol60/cfg-parser.ss
index f1492ae..a8d77ee 100644
--- a/collects/algol60/cfg-parser.ss
+++ b/collects/algol60/cfg-parser.ss
@@ -29,12 +29,12 @@
 ;; tokens.
 
 (module cfg-parser mzscheme
-  (require (lib "yacc.ss" "parser-tools")
-	   (lib "lex.ss" "parser-tools")
-           (lib "list.ss")
-           (lib "etc.ss"))
-  (require-for-syntax (lib "boundmap.ss" "syntax")
-                      (lib "list.ss")
+  (require parser-tools/yacc
+	   parser-tools/lex
+           mzlib/list
+           mzlib/etc)
+  (require-for-syntax syntax/boundmap
+                      mzlib/list
 		      (lib "token-syntax.ss" "parser-tools" "private-lex"))
 
   (provide cfg-parser)
diff --git a/collects/parser-tools/examples/calc.ss b/collects/parser-tools/examples/calc.ss
index 3ddd5eb..0f067e7 100644
--- a/collects/parser-tools/examples/calc.ss
+++ b/collects/parser-tools/examples/calc.ss
@@ -2,9 +2,9 @@
 
 
 ;; Import the parser and lexer generators.
-(require (lib "yacc.ss" "parser-tools")
-         (lib "lex.ss" "parser-tools")
-         (prefix : (lib "lex-sre.ss" "parser-tools")))
+(require parser-tools/yacc
+         parser-tools/lex
+         (prefix : parser-tools/lex-sre))
 
 (define-tokens value-tokens (NUM VAR FNCT))
 (define-empty-tokens op-tokens (newline = OP CP + - * / ^ EOF NEG))
diff --git a/collects/parser-tools/examples/read.ss b/collects/parser-tools/examples/read.ss
index 68838a1..13ef1f4 100644
--- a/collects/parser-tools/examples/read.ss
+++ b/collects/parser-tools/examples/read.ss
@@ -4,10 +4,10 @@
 
 (module read mzscheme
   
-  (require (lib "lex.ss" "parser-tools")
-           (prefix : (lib "lex-sre.ss" "parser-tools"))
-           (lib "yacc.ss" "parser-tools")
-           (lib "readerr.ss" "syntax"))
+  (require parser-tools/lex
+           (prefix : parser-tools/lex-sre)
+           parser-tools/yacc
+           syntax/readerr)
   
   (define-tokens data (DATUM))
   (define-empty-tokens delim (OP CP HASHOP QUOTE QUASIQUOTE UNQUOTE UNQUOTE-SPLICING DOT EOF))
diff --git a/collects/parser-tools/lex-plt-v200.ss b/collects/parser-tools/lex-plt-v200.ss
index 939c51a..34b8d16 100644
--- a/collects/parser-tools/lex-plt-v200.ss
+++ b/collects/parser-tools/lex-plt-v200.ss
@@ -1,6 +1,6 @@
 (module lex-plt-v200 mzscheme
-  (require (lib "lex.ss" "parser-tools")
-           (prefix : (lib "lex-sre.ss" "parser-tools")))
+  (require parser-tools/lex
+           (prefix : parser-tools/lex-sre))
   
   (provide epsilon
            ~
diff --git a/collects/parser-tools/lex-sre.ss b/collects/parser-tools/lex-sre.ss
index 9c6a6a7..28be898 100644
--- a/collects/parser-tools/lex-sre.ss
+++ b/collects/parser-tools/lex-sre.ss
@@ -1,5 +1,5 @@
 (module lex-sre mzscheme
-  (require (lib "lex.ss" "parser-tools"))
+  (require parser-tools/lex)
     
   (provide (rename sre-* *)
            (rename sre-+ +)
diff --git a/collects/parser-tools/lex.ss b/collects/parser-tools/lex.ss
index 5edc407..4aceb59 100644
--- a/collects/parser-tools/lex.ss
+++ b/collects/parser-tools/lex.ss
@@ -3,17 +3,17 @@
   ;; Provides the syntax used to create lexers and the functions needed to
   ;; create and use the buffer that the lexer reads from.  See docs.
 	
-  (require-for-syntax (lib "list.ss")
-                      (lib "stx.ss" "syntax")
-                      (lib "define.ss" "syntax")
-                      (lib "boundmap.ss" "syntax")
+  (require-for-syntax mzlib/list
+                      syntax/stx
+                      syntax/define
+                      syntax/boundmap
                       "private-lex/util.ss"
                       "private-lex/actions.ss"
                       "private-lex/front.ss"
                       "private-lex/unicode-chars.ss")
 
-  (require (lib "stxparam.ss")
-           (lib "readerr.ss" "syntax")
+  (require mzlib/stxparam
+           syntax/readerr
            "private-lex/token.ss")
 
   (provide lexer lexer-src-pos define-lex-abbrev define-lex-abbrevs define-lex-trans
diff --git a/collects/parser-tools/private-lex/actions.ss b/collects/parser-tools/private-lex/actions.ss
index 172e8dc..10330a8 100644
--- a/collects/parser-tools/private-lex/actions.ss
+++ b/collects/parser-tools/private-lex/actions.ss
@@ -1,6 +1,6 @@
 (module actions mzscheme
   (provide (all-defined))
-  (require (lib "stx.ss" "syntax"))
+  (require syntax/stx)
     
   ;; get-special-action: (syntax-object list) syntax-object syntax-object  -> syntax-object
   ;; Returns the first action from a rule of the form ((which-special) action)
diff --git a/collects/parser-tools/private-lex/deriv.ss b/collects/parser-tools/private-lex/deriv.ss
index 334100d..808d9fd 100644
--- a/collects/parser-tools/private-lex/deriv.ss
+++ b/collects/parser-tools/private-lex/deriv.ss
@@ -1,7 +1,7 @@
 (module deriv mzscheme
   
-  (require (lib "list.ss")
-           (prefix is: (lib "integer-set.ss"))
+  (require mzlib/list
+           (prefix is: mzlib/integer-set)
            "re.ss"
            "util.ss")
 
diff --git a/collects/parser-tools/private-lex/front.ss b/collects/parser-tools/private-lex/front.ss
index 5a35fa3..e6bf96e 100644
--- a/collects/parser-tools/private-lex/front.ss
+++ b/collects/parser-tools/private-lex/front.ss
@@ -1,7 +1,7 @@
 (module front mzscheme
-  (require (prefix is: (lib "integer-set.ss"))
-           (lib "list.ss")
-	   (lib "stx.ss" "syntax")
+  (require (prefix is: mzlib/integer-set)
+           mzlib/list
+	   syntax/stx
            "util.ss"
            "stx.ss"
            "re.ss"
diff --git a/collects/parser-tools/private-lex/re.ss b/collects/parser-tools/private-lex/re.ss
index 2da8e3d..2400933 100644
--- a/collects/parser-tools/private-lex/re.ss
+++ b/collects/parser-tools/private-lex/re.ss
@@ -1,7 +1,7 @@
 (module re mzscheme
-  (require (lib "match.ss")
-           (lib "list.ss")
-           (prefix is: (lib "integer-set.ss"))
+  (require mzlib/match
+           mzlib/list
+           (prefix is: mzlib/integer-set)
            "util.ss")
   
   (provide ->re build-epsilon build-zero build-char-set build-concat
diff --git a/collects/parser-tools/private-lex/stx.ss b/collects/parser-tools/private-lex/stx.ss
index e1211aa..4ae7575 100644
--- a/collects/parser-tools/private-lex/stx.ss
+++ b/collects/parser-tools/private-lex/stx.ss
@@ -1,5 +1,5 @@
 (module stx mzscheme
-  (require (lib "boundmap.ss" "syntax")
+  (require syntax/boundmap
            "util.ss")
   
   (provide parse)
diff --git a/collects/parser-tools/private-lex/util.ss b/collects/parser-tools/private-lex/util.ss
index 045e2ad..d63f03a 100644
--- a/collects/parser-tools/private-lex/util.ss
+++ b/collects/parser-tools/private-lex/util.ss
@@ -1,5 +1,5 @@
 (module util mzscheme
-  (require (lib "list.ss"))
+  (require mzlib/list)
   
   (provide (all-defined))
 
diff --git a/collects/parser-tools/private-yacc/grammar.ss b/collects/parser-tools/private-yacc/grammar.ss
index a5b1436..dd71a88 100644
--- a/collects/parser-tools/private-yacc/grammar.ss
+++ b/collects/parser-tools/private-yacc/grammar.ss
@@ -3,10 +3,10 @@
 
 (module grammar mzscheme
   
-  (require (lib "class.ss")
-           (lib "list.ss")
+  (require mzlib/class
+           mzlib/list
            "yacc-helper.ss"
-           (lib "contract.ss"))
+           mzlib/contract)
   
   ;; Each production has a unique index 0 <= index <= number of productions
   (define-struct prod (lhs rhs index prec action) (make-inspector))
diff --git a/collects/parser-tools/private-yacc/input-file-parser.ss b/collects/parser-tools/private-yacc/input-file-parser.ss
index 456c835..c8508f6 100644
--- a/collects/parser-tools/private-yacc/input-file-parser.ss
+++ b/collects/parser-tools/private-yacc/input-file-parser.ss
@@ -6,8 +6,8 @@
   (require "yacc-helper.ss"
            "../private-lex/token-syntax.ss"
            "grammar.ss"
-           (lib "class.ss")
-           (lib "contract.ss"))
+           mzlib/class
+           mzlib/contract)
   (require-for-template mzscheme)
   
 
diff --git a/collects/parser-tools/private-yacc/lalr.ss b/collects/parser-tools/private-yacc/lalr.ss
index d37c6d5..33df94e 100644
--- a/collects/parser-tools/private-yacc/lalr.ss
+++ b/collects/parser-tools/private-yacc/lalr.ss
@@ -4,8 +4,8 @@
   
   (require "lr0.ss"
 	   "grammar.ss"
-	   (lib "list.ss")
-	   (lib "class.ss"))
+	   mzlib/list
+	   mzlib/class)
 
   (provide compute-LA)
   
diff --git a/collects/parser-tools/private-yacc/lr0.ss b/collects/parser-tools/private-yacc/lr0.ss
index 07f82f6..0242bee 100644
--- a/collects/parser-tools/private-yacc/lr0.ss
+++ b/collects/parser-tools/private-yacc/lr0.ss
@@ -4,8 +4,8 @@
   
   (require "grammar.ss"
 	   "graph.ss"
-	   (lib "list.ss")
-	   (lib "class.ss"))
+	   mzlib/list
+	   mzlib/class)
   
   (provide build-lr0-automaton lr0%
 	   (struct trans-key (st gs)) trans-key-list-remove-dups
diff --git a/collects/parser-tools/private-yacc/parser-builder.ss b/collects/parser-tools/private-yacc/parser-builder.ss
index 467fa04..3830b67 100644
--- a/collects/parser-tools/private-yacc/parser-builder.ss
+++ b/collects/parser-tools/private-yacc/parser-builder.ss
@@ -3,8 +3,8 @@
   (require "input-file-parser.ss"
            "grammar.ss"
            "table.ss"
-           (lib "class.ss")
-           (lib "contract.ss"))
+           mzlib/class
+           mzlib/contract)
   (require-for-template mzscheme)
   
   (provide/contract
@@ -69,7 +69,7 @@
         #`(when #f
             (let ((bind void) ... (tmp void) ...)
               (void bound ... ... term-group ... start ... end ... prec ...))))))
-  (require (lib "list.ss") "parser-actions.ss")
+  (require mzlib/list "parser-actions.ss")
   (define (build-parser filename src-pos suppress input-terms start end assocs prods)
     (let* ((grammar (parse-input input-terms start end assocs prods src-pos))
            (table (build-table grammar filename suppress))
diff --git a/collects/parser-tools/private-yacc/table.ss b/collects/parser-tools/private-yacc/table.ss
index be96a2a..9493b65 100644
--- a/collects/parser-tools/private-yacc/table.ss
+++ b/collects/parser-tools/private-yacc/table.ss
@@ -6,9 +6,9 @@
 	   "lr0.ss"
 	   "lalr.ss"
 	   "parser-actions.ss"
-	   (lib "contract.ss")
-           (lib "list.ss")
-	   (lib "class.ss"))
+	   mzlib/contract
+           mzlib/list
+	   mzlib/class)
 
   (provide/contract 
    (build-table ((is-a?/c grammar%) string? any/c . -> .
diff --git a/collects/parser-tools/private-yacc/yacc-helper.ss b/collects/parser-tools/private-yacc/yacc-helper.ss
index 4ffc007..2d66fd4 100644
--- a/collects/parser-tools/private-yacc/yacc-helper.ss
+++ b/collects/parser-tools/private-yacc/yacc-helper.ss
@@ -1,6 +1,6 @@
 (module yacc-helper mzscheme
 
-  (require (lib "list.ss")
+  (require mzlib/list
            "../private-lex/token-syntax.ss")
   
   ;; General helper routines
diff --git a/collects/parser-tools/yacc-to-scheme.ss b/collects/parser-tools/yacc-to-scheme.ss
index 36dc7ac..e854fca 100644
--- a/collects/parser-tools/yacc-to-scheme.ss
+++ b/collects/parser-tools/yacc-to-scheme.ss
@@ -1,9 +1,9 @@
 (module yacc-to-scheme mzscheme
-  (require (lib "lex.ss" "parser-tools")
-           (prefix : (lib "lex-sre.ss" "parser-tools"))
-           (lib "yacc.ss" "parser-tools")
-           (lib "readerr.ss" "syntax")
-           (lib "list.ss"))
+  (require parser-tools/lex
+           (prefix : parser-tools/lex-sre)
+           parser-tools/yacc
+           syntax/readerr
+           mzlib/list)
   (provide trans)
   
   (define match-double-string
diff --git a/collects/parser-tools/yacc.ss b/collects/parser-tools/yacc.ss
index 2929054..5803c7c 100644
--- a/collects/parser-tools/yacc.ss
+++ b/collects/parser-tools/yacc.ss
@@ -6,9 +6,9 @@
                       "private-yacc/parser-actions.ss")
   (require "private-lex/token.ss"
            "private-yacc/parser-actions.ss"
-           (lib "etc.ss")
-           (lib "pretty.ss")
-	   (lib "readerr.ss" "syntax"))
+           mzlib/etc
+           mzlib/pretty
+	   syntax/readerr)
   
   (provide parser)