diff --git a/scheme/httpd/server.scm b/scheme/httpd/server.scm
index 1cb0581..7364f99 100755
--- a/scheme/httpd/server.scm
+++ b/scheme/httpd/server.scm
@@ -14,11 +14,10 @@ exec scsh -lm ../packages.scm -dm -o http-top -e top -s "$0" "$@"
 (define-structure http-top (export top)
   (open httpd-core
 	httpd-make-options
-	cgi-server
+	httpd-cgi-server
 	httpd-basic-handlers
-	seval-handler
-	scsh
-	scheme)
+	httpd-seval-handlers
+	scheme-with-scsh)
   (begin
 
     ;; Kitchen-sink request handler.
diff --git a/scheme/packages.scm b/scheme/packages.scm
index bb00f70..37b6ec5 100644
--- a/scheme/packages.scm
+++ b/scheme/packages.scm
@@ -380,15 +380,15 @@
 	  rooted-file-handler
 	  rooted-file-or-directory-handler))
 
-(define-interface seval-handler-interface
-  (export seval-handler))
+(define-interface httpd-seval-handlers-interface
+  (export httpd-seval-handler))
 
-(define-interface info-gateway-interface
+(define-interface httpd-info-gateway-interface
   (export info-handler
 	  find-info-file
 	  info-gateway-error))
 
-(define-interface rman-gateway-interface
+(define-interface httpd-rman-gateway-interface
 (export rman-handler
 	man
 	parse-man-entry
@@ -398,7 +398,7 @@
 	cat-n-decode
 	nroff-n-decode))
 
-(define-interface cgi-server-interface 
+(define-interface httpd-cgi-handlers-interface 
   (export cgi-default-bin-path
 	  cgi-handler))
 
@@ -784,7 +784,7 @@
 	)
   (files (httpd file-dir-handler)))
 
-(define-structure seval-handler seval-handler-interface
+(define-structure httpd-seval-handler httpd-seval-handler-interface
   (open scheme-with-scsh		; syscalls & INDEX
 	httpd-error
 	httpd-requests			; v0.9-request
@@ -803,7 +803,7 @@
 	)
   (files (httpd seval)))
 
-(define-structure info-gateway  info-gateway-interface
+(define-structure httpd-info-gateway httpd-info-gateway-interface
   (open scheme-with-scsh
 	big-scheme
 	srfi-13
@@ -817,7 +817,7 @@
 	handle-fatal-error)
   (files (httpd info-gateway)))
 
-(define-structure rman-gateway rman-gateway-interface
+(define-structure httpd-rman-gateway httpd-rman-gateway-interface
   (open scheme-with-scsh
 	httpd-responses
 	httpd-requests
@@ -833,7 +833,7 @@
 	srfi-13)
   (files (httpd rman-gateway)))
 
-(define-structure cgi-server cgi-server-interface
+(define-structure httpd-cgi-handlers httpd-cgi-handlers-interface
   (open	scheme-with-scsh
 	srfi-13
 	rfc822