diff --git a/doc/latex/httpd.tex b/doc/latex/httpd.tex
index 84223f4..f93c055 100644
--- a/doc/latex/httpd.tex
+++ b/doc/latex/httpd.tex
@@ -1,9 +1,10 @@
 \section{HTTP server}\label{sec:httpd}
 %
 \begin{description}
-\item[Used files:] httpd-core.scm, httpd-handlers.scm, httpd-options.scm
-\item[Name of the package:] httpd-core, httpd-basic-handler, httpd-make-options
+\item[Used files:] httpd/core.scm, httpd/handlers.scm, httpd/options.scm,
+\item[Name of the packages:] httpd-core, httpd-basic-handler, httpd-make-options
 \end{description}
+There are also some other files and packages that are used internally.
 %
 
 \subsection{Introduction}
diff --git a/modules.scm b/modules.scm
index 0dbc98e..ac1ba66 100644
--- a/modules.scm
+++ b/modules.scm
@@ -599,7 +599,7 @@
 	string-lib     ; STRING-JOIN
 	i/o            ; make-null-output-port
 	scheme)
-  (files (httpd httpd-core)))
+  (files (httpd core)))
 
 
 ;;; httpd-make-options
@@ -631,7 +631,7 @@
 		    (httpd-read-options httpd-read-options-interface))
   (open scheme
 	define-record-types)
-  (files (httpd httpd-options)))
+  (files (httpd options)))
 
 
 ;;; httpd-access-control
@@ -649,7 +649,7 @@
 	string-lib    ; STRING-MAP
 	scsh
 	scheme)
-  (files (httpd httpd-access-control)))
+  (files (httpd access-control)))
 
 
 ;;; httpd-error
@@ -662,7 +662,7 @@
 
 (define-structure httpd-error httpd-error-interface
   (open conditions signals handle scheme)
-  (files (httpd httpd-error)))
+  (files (httpd error)))
 
 ;;; httpd-fatal-error
 
@@ -707,7 +707,7 @@
 	handle-fatal-error  ; WITH-FATAL-ERROR-HANDLER
 	string-lib      ; STRING-JOIN
 	scheme)
-  (files (httpd httpd-handlers)))
+  (files (httpd handlers)))
 
 
 ;;; seval-handler
diff --git a/scheme/httpd/httpd-access-control.scm b/scheme/httpd/access-control.scm
similarity index 100%
rename from scheme/httpd/httpd-access-control.scm
rename to scheme/httpd/access-control.scm
diff --git a/scheme/httpd/httpd-core.scm b/scheme/httpd/core.scm
similarity index 100%
rename from scheme/httpd/httpd-core.scm
rename to scheme/httpd/core.scm
diff --git a/scheme/httpd/httpd-error.scm b/scheme/httpd/error.scm
similarity index 100%
rename from scheme/httpd/httpd-error.scm
rename to scheme/httpd/error.scm
diff --git a/scheme/httpd/httpd-handlers.scm b/scheme/httpd/handlers.scm
similarity index 100%
rename from scheme/httpd/httpd-handlers.scm
rename to scheme/httpd/handlers.scm
diff --git a/scheme/httpd/httpd-options.scm b/scheme/httpd/options.scm
similarity index 100%
rename from scheme/httpd/httpd-options.scm
rename to scheme/httpd/options.scm