diff --git a/collects/mzlib/port.ss b/collects/mzlib/port.ss
index e2304f4..0635601 100644
--- a/collects/mzlib/port.ss
+++ b/collects/mzlib/port.ss
@@ -18,11 +18,11 @@
        (lambda (s start end non-block? breakable?) (- end start))
        void
        (lambda (special non-block?) #t)
-       (lambda (s start end) (wrap-evt
+       (lambda (s start end) (convert-evt
 			      always-evt
 			      (lambda (x)
 				(- end start))))
-       (lambda (special) (wrap-evt always-evt (lambda (x) #t))))))
+       (lambda (special) (convert-evt always-evt (lambda (x) #t))))))
 
   (define (copy-port src dest . dests)
     (unless (input-port? src)
@@ -80,7 +80,7 @@
     (define special-peeked null)
     (define special-peeked-tail #f)
     (define (try-again)
-      (wrap-evt
+      (convert-evt
        (semaphore-peek-evt lock-semaphore)
        (lambda (x) 0)))
     (define (read-it s)
diff --git a/collects/net/mime-unit.ss b/collects/net/mime-unit.ss
index 0137610..34fadf1 100644
--- a/collects/net/mime-unit.ss
+++ b/collects/net/mime-unit.ss
@@ -36,7 +36,7 @@
            (lib "unitsig.ss")
            (lib "etc.ss")
            (lib "string.ss")
-           (lib "thread.ss"))
+           (lib "port.ss"))
 
   (provide net:mime@)
   (define net:mime@
diff --git a/collects/net/url-unit.ss b/collects/net/url-unit.ss
index 4d698ba..0e2f612 100644
--- a/collects/net/url-unit.ss
+++ b/collects/net/url-unit.ss
@@ -12,7 +12,7 @@
 (module url-unit mzscheme
   (require (lib "file.ss")
            (lib "unitsig.ss")
-	   (lib "thread.ss")
+	   (lib "port.ss")
 	   "uri-codec.ss"
            "url-sig.ss"
            "tcp-sig.ss")