diff --git a/collects/web-server/compat/0/dispatch.rkt b/collects/web-server/compat/0/dispatch.rkt
new file mode 100644
index 0000000000..a4f196de0a
--- /dev/null
+++ b/collects/web-server/compat/0/dispatch.rkt
@@ -0,0 +1,9 @@
+#lang racket/base
+(require web-server/dispatch/syntax
+         "dispatch/serve.rkt"
+         web-server/dispatch/url-patterns
+         web-server/dispatch/container)
+(provide (all-from-out web-server/dispatch/syntax
+                       "dispatch/serve.rkt"
+                       web-server/dispatch/url-patterns
+                       web-server/dispatch/container))
diff --git a/collects/web-server/compat/0/dispatchers/dispatch-lift.rkt b/collects/web-server/compat/0/dispatchers/dispatch-lift.rkt
index e50c7bbc3a..4b9c7dbb62 100644
--- a/collects/web-server/compat/0/dispatchers/dispatch-lift.rkt
+++ b/collects/web-server/compat/0/dispatchers/dispatch-lift.rkt
@@ -5,4 +5,7 @@
 (define (make d)
   (new:make (λ (req) (normalize-response (d req)))))
 
-(provide (all-defined-out))
\ No newline at end of file
+(provide 
+ (rename-out
+  [new:interface-version interface-version])
+ (all-defined-out))
\ No newline at end of file
diff --git a/collects/web-server/compat/0/dispatchers/dispatch-pathprocedure.rkt b/collects/web-server/compat/0/dispatchers/dispatch-pathprocedure.rkt
index 91f4c07e49..7654bd996b 100644
--- a/collects/web-server/compat/0/dispatchers/dispatch-pathprocedure.rkt
+++ b/collects/web-server/compat/0/dispatchers/dispatch-pathprocedure.rkt
@@ -5,4 +5,7 @@
 (define (make p d)
   (new:make p (λ (req) (normalize-response (d req)))))
 
-(provide (all-defined-out))
\ No newline at end of file
+(provide 
+ (rename-out
+  [new:interface-version interface-version])
+ (all-defined-out))
\ No newline at end of file
diff --git a/collects/web-server/compat/0/http/cookie.rkt b/collects/web-server/compat/0/http/cookie.rkt
index 834b08baaa..c409217a7f 100644
--- a/collects/web-server/compat/0/http/cookie.rkt
+++ b/collects/web-server/compat/0/http/cookie.rkt
@@ -1,7 +1,12 @@
 #lang racket/base
-(require web-server/http/xexpr)
+(require (prefix-in new: web-server/http/cookie)
+         web-server/http/xexpr)
 
 (define (xexpr-response/cookies cs xe)
   (response/xexpr xe #:cookies cs))
 
-(provide (all-from-out))
\ No newline at end of file
+(provide 
+ (rename-out
+  [new:make-cookie make-cookie]
+  [new:cookie->header cookie->header])
+ (all-from-out))
\ No newline at end of file
diff --git a/collects/web-server/compat/0/http/response-structs.rkt b/collects/web-server/compat/0/http/response-structs.rkt
index 80ce129f6f..cc324603a4 100644
--- a/collects/web-server/compat/0/http/response-structs.rkt
+++ b/collects/web-server/compat/0/http/response-structs.rkt
@@ -1,5 +1,6 @@
 #lang racket/base
 (require racket/contract
+         (prefix-in new: web-server/http/response-structs)
          web-server/http/response-structs
          web-server/http/xexpr
          racket/list
@@ -65,6 +66,8 @@
     [else
      (response/xexpr r)]))
 
-(provide (except-out (all-defined-out)
-                     BODIES
-                     GENS))
\ No newline at end of file
+(provide 
+ (rename-out [new:TEXT/HTML-MIME-TYPE TEXT/HTML-MIME-TYPE])
+ (except-out (all-defined-out)
+             BODIES
+             GENS))
\ No newline at end of file
diff --git a/collects/web-server/compat/0/http/response.rkt b/collects/web-server/compat/0/http/response.rkt
index 9cbdb02c3f..aa85ab5fff 100644
--- a/collects/web-server/compat/0/http/response.rkt
+++ b/collects/web-server/compat/0/http/response.rkt
@@ -7,4 +7,8 @@
 (define (output-response/method conn r meth)
   (new:output-response/method conn (normalize-response r) meth))
 
-(provide (all-defined-out))
\ No newline at end of file
+(provide 
+ (rename-out
+  [new:print-headers print-headers]
+  [new:output-file output-file])
+ (all-defined-out))
\ No newline at end of file
diff --git a/collects/web-server/compat/0/servlet-dispatch.rkt b/collects/web-server/compat/0/servlet-dispatch.rkt
index 8fc5f456dc..e7b349abc8 100644
--- a/collects/web-server/compat/0/servlet-dispatch.rkt
+++ b/collects/web-server/compat/0/servlet-dispatch.rkt
@@ -10,4 +10,5 @@
                     kw-args
                     (λ (req) (normalize-response (gen req)))))))
 
-(provide (all-defined-out))
\ No newline at end of file
+(provide (rename-out [new:serve/launch/wait serve/launch/wait])
+         (all-defined-out))
\ No newline at end of file
diff --git a/collects/web-server/compat/0/servlet.rkt b/collects/web-server/compat/0/servlet.rkt
index 0880400766..95ee5c2d73 100644
--- a/collects/web-server/compat/0/servlet.rkt
+++ b/collects/web-server/compat/0/servlet.rkt
@@ -3,13 +3,13 @@
          web-server/servlet/web-cells         
          web-server/http/bindings
          "http.rkt"
-         web-server/dispatch
+         "dispatch.rkt"
          web-server/servlet/servlet-structs
          "servlet/web.rkt")
 (provide (all-from-out net/url
                        web-server/servlet/web-cells
                        web-server/http/bindings
                        "http.rkt"
-                       web-server/dispatch
+                       "dispatch.rkt"
                        web-server/servlet/servlet-structs
                        "servlet/web.rkt"))
diff --git a/collects/web-server/compat/0/servlet/web.rkt b/collects/web-server/compat/0/servlet/web.rkt
index e8bd46ba65..268c243a4d 100644
--- a/collects/web-server/compat/0/servlet/web.rkt
+++ b/collects/web-server/compat/0/servlet/web.rkt
@@ -29,4 +29,14 @@
 (define-ssd-like new:send/suspend/dispatch send/suspend/dispatch)
 (define-ssd-like new:send/suspend/url/dispatch send/suspend/url/dispatch)
 
-(provide (all-defined-out))
\ No newline at end of file
+(provide 
+ (rename-out [new:servlet-prompt servlet-prompt]
+             [new:continuation-url? continuation-url?]
+             [new:current-servlet-continuation-expiration-handler
+              current-servlet-continuation-expiration-handler]
+             [new:redirect/get redirect/get]
+             [new:redirect/get/forget redirect/get/forget]
+             [new:adjust-timeout! adjust-timeout!]
+             [new:clear-continuation-table! clear-continuation-table!]
+             [new:with-errors-to-browser with-errors-to-browser])
+ (all-defined-out))
\ No newline at end of file
diff --git a/collects/web-server/dispatch.rkt b/collects/web-server/dispatch.rkt
index 6abdf49184..24cda1cc5d 100644
--- a/collects/web-server/dispatch.rkt
+++ b/collects/web-server/dispatch.rkt
@@ -1,4 +1,4 @@
-#lang racket
+#lang racket/base
 (require web-server/dispatch/syntax
          web-server/dispatch/serve
          web-server/dispatch/url-patterns