diff --git a/collects/web-server/prototype-web-server/tests/test-normalizer.ss b/collects/web-server/prototype-web-server/tests/anormal-test.ss
similarity index 99%
rename from collects/web-server/prototype-web-server/tests/test-normalizer.ss
rename to collects/web-server/prototype-web-server/tests/anormal-test.ss
index b94e2c2594..828bada8fa 100644
--- a/collects/web-server/prototype-web-server/tests/test-normalizer.ss
+++ b/collects/web-server/prototype-web-server/tests/anormal-test.ss
@@ -1,7 +1,7 @@
-(module test-normalizer mzscheme
+(module anormal-test mzscheme
   (require (planet "test.ss" ("schematics" "schemeunit.plt" 1 1))
            "../lang/anormal.ss")
-  (provide test-normalizer-suite)
+  (provide anormal-tests)
   
   (define (empty-env var)
     (error "empty environment"))
@@ -134,7 +134,7 @@
   ;; **************************************************
   ;; ACTUAL TESTS
   
-  (define test-normalizer-suite
+  (define anormal-tests
     (make-test-suite
      "Tests for Normalization Phase"
      (make-test-suite
diff --git a/collects/web-server/prototype-web-server/tests/certify-tests.ss b/collects/web-server/prototype-web-server/tests/certify-tests.ss
index b0ae4cadc8..cf7af440ae 100644
--- a/collects/web-server/prototype-web-server/tests/certify-tests.ss
+++ b/collects/web-server/prototype-web-server/tests/certify-tests.ss
@@ -1,6 +1,6 @@
 (module certify-tests mzscheme
   (require (planet "test.ss" ("schematics" "schemeunit.plt" 1 1))
-           "language-tester.ss")
+           "util.ss")
   (provide certify-suite)
     
   (define the-dispatch
diff --git a/collects/web-server/prototype-web-server/tests/lang-tests.ss b/collects/web-server/prototype-web-server/tests/lang-tests.ss
index 7c30983369..dbda1ff49d 100644
--- a/collects/web-server/prototype-web-server/tests/lang-tests.ss
+++ b/collects/web-server/prototype-web-server/tests/lang-tests.ss
@@ -1,6 +1,6 @@
 (module lang-tests mzscheme
   (require (planet "test.ss" ("schematics" "schemeunit.plt" 1 1))
-           "language-tester.ss")
+           "util.ss")
   (provide lang-suite)
   
   (define (catch-unsafe-context-exn thunk)
diff --git a/collects/web-server/prototype-web-server/tests/stuff-url-tests.ss b/collects/web-server/prototype-web-server/tests/stuff-url-tests.ss
index 613ff8888a..cef025dc43 100644
--- a/collects/web-server/prototype-web-server/tests/stuff-url-tests.ss
+++ b/collects/web-server/prototype-web-server/tests/stuff-url-tests.ss
@@ -5,7 +5,7 @@
            (lib "url.ss" "net")
            (lib "dirs.ss" "setup")
            (lib "file.ss")
-           "language-tester.ss")
+           "util.ss")
   
   (require/expose (lib "stuff-url.ss" "web-server" "prototype-web-server")
                   (same-module? url-parts recover-serial))
diff --git a/collects/web-server/prototype-web-server/tests/suite.ss b/collects/web-server/prototype-web-server/tests/suite.ss
index c0a8213061..b8a9ba0777 100644
--- a/collects/web-server/prototype-web-server/tests/suite.ss
+++ b/collects/web-server/prototype-web-server/tests/suite.ss
@@ -3,7 +3,7 @@
            (planet "text-ui.ss" ("schematics" "schemeunit.plt" 1))
            (planet "test.ss" ("schematics" "schemeunit.plt" 1 1))
            "persistent-close-tests.ss"
-           "test-normalizer.ss"
+           "anormal-test.ss"
            "closure-tests.ss"
            "labels-tests.ss"
            "lang-tests.ss"
@@ -15,7 +15,7 @@
     "Main Tests for Prototype Web Server"
     persistent-close-suite
     stuff-url-suite
-    test-normalizer-suite
+    anormal-tests
     closure-tests-suite
     labels-tests-suite
     lang-suite
diff --git a/collects/web-server/prototype-web-server/tests/language-tester.ss b/collects/web-server/prototype-web-server/tests/util.ss
similarity index 95%
rename from collects/web-server/prototype-web-server/tests/language-tester.ss
rename to collects/web-server/prototype-web-server/tests/util.ss
index 0d8e1ce0bb..2c65b69543 100644
--- a/collects/web-server/prototype-web-server/tests/language-tester.ss
+++ b/collects/web-server/prototype-web-server/tests/util.ss
@@ -1,4 +1,4 @@
-(module language-tester mzscheme
+(module util mzscheme
   (provide make-module-eval
            make-eval/mod-path)