diff --git a/scheme/lib/uri.scm b/scheme/lib/uri.scm
index 12b24d3..fcd0442 100644
--- a/scheme/lib/uri.scm
+++ b/scheme/lib/uri.scm
@@ -3,6 +3,7 @@
 ;;; This file is part of the Scheme Untergrund Networking package.
 
 ;;; Copyright (c) 1995 by Olin Shivers.
+;;; Copyright (c) 2004 by Viola Brunner.
 ;;; For copyright information, see the file COPYING which comes with
 ;;; the distribution.
 
@@ -21,7 +22,7 @@
 
 ;;; Caution:
 ;;; a URI must be separated into its components (for a HTTP-URL e.g. parsed by
-;;; PARSE-URI) before the escaped characters within those components
+;;; PARSE-URL) before the escaped characters within those components
 ;;; can be safely decoded. Don't use UNESCAPE on an unparsed URI.
 
 (define (unescape s)
diff --git a/scheme/lib/url.scm b/scheme/lib/url.scm
index a3b2b8d..eec5db3 100644
--- a/scheme/lib/url.scm
+++ b/scheme/lib/url.scm
@@ -161,7 +161,7 @@
 ;;;
 ;;; don't decode yet!
 
-(define (parse-uri request-uri)
+(define (parse-url request-uri)
    (cond 
 
     ((regexp-search abs_path_with_frag request-uri)
@@ -226,7 +226,7 @@
   (path http-url-path)		
   (query http-url-query))
 
-;;; decode various parts of the Request_URI as returned by PARSE-URI;
+;;; decode various parts of the Request_URI as returned by PARSE-URL;
 ;;; returns a HTTP-URL record.
 
 (define (parsed-uri->http-url host port path query)
@@ -237,13 +237,12 @@
 
   (make-http-url host portnumber decoded-path decoded-query)))
 
-;;really decode query here??
 
 ;;; parse a HTTP 1.1. Request_URI into a http-url record
 
 (define (uri-string->http-url uri-string)
   (call-with-values
-   (lambda () (parse-uri uri-string))
+   (lambda () (parse-url uri-string))
    parsed-uri->http-url))
 
 ;;; Unparse a http-url record into its corresponding Request_URI