diff --git a/Makefile.am b/Makefile.am
index 4236de4fcefb1281a12c465b3623592a89b0ce29..dd087bf442fcb3385d02284b855f9ce71b692c45 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -53,7 +53,7 @@ MODULES =					\
   guix/build-system/python.scm			\
   guix/build-system/trivial.scm			\
   guix/ftp-client.scm				\
-  guix/web.scm					\
+  guix/http-client.scm				\
   guix/gnupg.scm				\
   guix/store.scm				\
   guix/ui.scm					\
diff --git a/guix/gnu-maintenance.scm b/guix/gnu-maintenance.scm
index 06baa1e97ba1937f68617d12e22c2bc0733e97ff..8ef7cc72920737e4d5d5ef3b07ad7f7fca1d6bf1 100644
--- a/guix/gnu-maintenance.scm
+++ b/guix/gnu-maintenance.scm
@@ -27,7 +27,7 @@ (define-module (guix gnu-maintenance)
   #:use-module (srfi srfi-11)
   #:use-module (srfi srfi-26)
   #:use-module (system foreign)
-  #:use-module (guix web)
+  #:use-module (guix http-client)
   #:use-module (guix ftp-client)
   #:use-module (guix ui)
   #:use-module (guix utils)
diff --git a/guix/web.scm b/guix/http-client.scm
similarity index 98%
rename from guix/web.scm
rename to guix/http-client.scm
index 321c38391d38ec5a216c206ebca2b19dbb795db4..898b1669e58f28c40b87fe8a8acd6b7de18785e1 100644
--- a/guix/web.scm
+++ b/guix/http-client.scm
@@ -17,7 +17,7 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
-(define-module (guix web)
+(define-module (guix http-client)
   #:use-module (guix utils)
   #:use-module (web uri)
   #:use-module (web client)
@@ -32,7 +32,7 @@ (define-module (guix web)
 
 ;;; Commentary:
 ;;;
-;;; Web client portable among Guile versions.
+;;; HTTP client portable among Guile versions.
 ;;;
 ;;; Code:
 
@@ -205,4 +205,4 @@ (define* (http-fetch uri #:key port (text? #f) (buffered? #t))
            (error "download failed" uri code
                   (response-reason-phrase resp))))))))
 
-;;; web.scm ends here
+;;; http-client.scm ends here
diff --git a/guix/scripts/substitute-binary.scm b/guix/scripts/substitute-binary.scm
index fbb5cf8337356f08db3920352ec81cf4b953183f..7398d59957fac5fc7ed07151efff938abb1fbdf9 100755
--- a/guix/scripts/substitute-binary.scm
+++ b/guix/scripts/substitute-binary.scm
@@ -39,7 +39,7 @@ (define-module (guix scripts substitute-binary)
   #:use-module (srfi srfi-19)
   #:use-module (srfi srfi-26)
   #:use-module (web uri)
-  #:use-module (guix web)
+  #:use-module (guix http-client)
   #:export (guix-substitute-binary))
 
 ;;; Comment:
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 839b069704d83bea8385af5644bdc5d476c792f3..0e30bb0880471cb98d9480de7f851afda54f0130 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -13,4 +13,4 @@ guix/scripts/pull.scm
 guix/scripts/substitute-binary.scm
 guix/gnu-maintenance.scm
 guix/ui.scm
-guix/web.scm
+guix/http-client.scm