diff --git a/server.scm b/server.scm
index b9a8b4e..57d0738 100755
--- a/server.scm
+++ b/server.scm
@@ -1,5 +1,5 @@
 #!/usr/local/bin/scsh \
--lm modules.scm -lm toothless.scm -dm -o http-top -e top -s
+-lm modules.scm -dm -o http-top -e top -s
 !#
 
 ;;; Scheme Underground Web Server -*- Scheme -*-
@@ -12,9 +12,9 @@
 
 (define-structure http-top (export top)
   (open httpd-core
-	cgi-server-package
+	cgi-server
 	httpd-basic-handlers
-	seval-handler-package
+	seval-handler
 	scsh
 	scheme)
   (begin