diff --git a/collects/mzlib/kw-proc.ss b/collects/mzlib/kw.ss
similarity index 98%
rename from collects/mzlib/kw-proc.ss
rename to collects/mzlib/kw.ss
index 2f1e1ff946..58c0936c50 100644
--- a/collects/mzlib/kw-proc.ss
+++ b/collects/mzlib/kw.ss
@@ -1,4 +1,4 @@
-(module kw-proc mzscheme
+(module kw mzscheme
 
 (require-for-syntax (lib "define.ss" "syntax"))
 
@@ -51,11 +51,11 @@
                 (raise-syntax-error #f (apply format fmt args) stx sub))
               (cond
                [k (case k
-                    [(#:optional #:optionals #:opt #:opts)
+                    [(#:optional)
                      (if state
                        (serror #'formals "misplaced ~a argument" k)
                        (loop 'o #'xs))]
-                    [(#:key #:keys)
+                    [(#:key)
                      (if (memq state '(#f o r!))
                        (loop 'k #'xs)
                        (serror #'formals "misplaced ~a argument" k))]
diff --git a/collects/tests/mzscheme/kw-proc.ss b/collects/tests/mzscheme/kw.ss
similarity index 93%
rename from collects/tests/mzscheme/kw-proc.ss
rename to collects/tests/mzscheme/kw.ss
index e053448349..aaaf4a0d97 100644
--- a/collects/tests/mzscheme/kw-proc.ss
+++ b/collects/tests/mzscheme/kw.ss
@@ -1,9 +1,9 @@
 
 (load-relative "loadtest.ss")
 
-(SECTION 'kw-proc)
+(SECTION 'kw)
 
-(require (lib "kw-proc.ss"))
+(require (lib "kw.ss"))
 
 ;; make sure that lambda/kw behaves as lambda
 (test 1 (lambda/kw () 1))
diff --git a/collects/tests/mzscheme/mzlib.ss b/collects/tests/mzscheme/mzlib.ss
index f5fdde5903..f874b53555 100644
--- a/collects/tests/mzscheme/mzlib.ss
+++ b/collects/tests/mzscheme/mzlib.ss
@@ -40,7 +40,7 @@
 
 (load-relative "match-test.ss")
 
-(load-relative "kw-proc.ss")
+(load-relative "kw.ss")
 
 ; Next-to-last, because it `require's mzscheme
 (load-relative "shared.ss")