distro: Change the module name space to (gnu ...).

* distro: Rename to...
* gnu: ... this.  Update module names accordingly.
* Makefile.am: Adjust accordingly.
* po/POTFILES.in: Likewise.
* distro.scm: Search for files under /gnu/packages instead of
  /distro/packages.
* gnu/packages/base.scm (ld-wrapper-boot3): Likewise.

126 files changed, 370 insertions, 370 deletions

diff --git a/.gitignore b/.gitignore
index 0b21a03ece..d841cb1ad6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,9 +44,9 @@ config.cache
 /doc/guix.pdf
 /doc/stamp-vti
 /doc/version.texi
-/distro/packages/bootstrap/x86_64-linux/guile-bootstrap-2.0.6.tar.xz
 /guix-download
-/distro/packages/bootstrap/i686-linux/guile-bootstrap-2.0.6.tar.xz
+/gnu/packages/bootstrap/x86_64-linux/guile-2.0.7.tar.xz
+/gnu/packages/bootstrap/i686-linux/guile-2.0.7.tar.xz
 /guix-package
 /guix/config.scm
 /guix-import
diff --git a/Makefile.am b/Makefile.am
index 35e973bbba..b4c8c931fd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -45,138 +45,138 @@ MODULES =					\
   guix/snix.scm					\
   guix.scm					\
   distro.scm					\
-  distro/packages/acl.scm			\
-  distro/packages/algebra.scm			\
-  distro/packages/aspell.scm			\
-  distro/packages/attr.scm			\
-  distro/packages/autotools.scm			\
-  distro/packages/base.scm			\
-  distro/packages/bash.scm			\
-  distro/packages/bdb.scm			\
-  distro/packages/bdw-gc.scm			\
-  distro/packages/bison.scm			\
-  distro/packages/bootstrap.scm			\
-  distro/packages/check.scm			\
-  distro/packages/compression.scm		\
-  distro/packages/cpio.scm			\
-  distro/packages/cyrus-sasl.scm		\
-  distro/packages/dejagnu.scm			\
-  distro/packages/ddrescue.scm			\
-  distro/packages/ed.scm			\
-  distro/packages/emacs.scm			\
-  distro/packages/file.scm			\
-  distro/packages/flex.scm			\
-  distro/packages/gawk.scm			\
-  distro/packages/gdb.scm			\
-  distro/packages/gdbm.scm			\
-  distro/packages/gettext.scm			\
-  distro/packages/global.scm			\
-  distro/packages/gnupg.scm			\
-  distro/packages/gnutls.scm			\
-  distro/packages/gperf.scm			\
-  distro/packages/gsasl.scm			\
-  distro/packages/guile.scm			\
-  distro/packages/help2man.scm			\
-  distro/packages/icu4c.scm			\
-  distro/packages/idutils.scm			\
-  distro/packages/indent.scm			\
-  distro/packages/ld-wrapper.scm		\
-  distro/packages/less.scm			\
-  distro/packages/libffi.scm			\
-  distro/packages/libidn.scm			\
-  distro/packages/libjpeg.scm			\
-  distro/packages/libsigsegv.scm		\
-  distro/packages/libtiff.scm		\
-  distro/packages/libunistring.scm		\
-  distro/packages/libusb.scm			\
-  distro/packages/linux.scm			\
-  distro/packages/lout.scm			\
-  distro/packages/lsh.scm			\
-  distro/packages/m4.scm			\
-  distro/packages/mailutils.scm			\
-  distro/packages/make-bootstrap.scm		\
-  distro/packages/mit-krb5.scm			\
-  distro/packages/multiprecision.scm		\
-  distro/packages/mysql.scm			\
-  distro/packages/nano.scm			\
-  distro/packages/ncurses.scm			\
-  distro/packages/nettle.scm			\
-  distro/packages/openssl.scm			\
-  distro/packages/perl.scm			\
-  distro/packages/pkg-config.scm		\
-  distro/packages/pth.scm			\
-  distro/packages/python.scm			\
-  distro/packages/readline.scm			\
-  distro/packages/recutils.scm			\
-  distro/packages/rsync.scm			\
-  distro/packages/scheme.scm			\
-  distro/packages/shishi.scm			\
-  distro/packages/system.scm			\
-  distro/packages/tcl.scm			\
-  distro/packages/texinfo.scm			\
-  distro/packages/time.scm			\
-  distro/packages/wget.scm			\
-  distro/packages/which.scm			\
-  distro/packages/xml.scm			\
-  distro/packages/zile.scm
+  gnu/packages/acl.scm				\
+  gnu/packages/algebra.scm			\
+  gnu/packages/aspell.scm			\
+  gnu/packages/attr.scm				\
+  gnu/packages/autotools.scm			\
+  gnu/packages/base.scm				\
+  gnu/packages/bash.scm				\
+  gnu/packages/bdb.scm				\
+  gnu/packages/bdw-gc.scm			\
+  gnu/packages/bison.scm			\
+  gnu/packages/bootstrap.scm			\
+  gnu/packages/check.scm			\
+  gnu/packages/compression.scm			\
+  gnu/packages/cpio.scm				\
+  gnu/packages/cyrus-sasl.scm			\
+  gnu/packages/dejagnu.scm			\
+  gnu/packages/ddrescue.scm			\
+  gnu/packages/ed.scm				\
+  gnu/packages/emacs.scm			\
+  gnu/packages/file.scm				\
+  gnu/packages/flex.scm				\
+  gnu/packages/gawk.scm				\
+  gnu/packages/gdb.scm				\
+  gnu/packages/gdbm.scm				\
+  gnu/packages/gettext.scm			\
+  gnu/packages/global.scm			\
+  gnu/packages/gnupg.scm			\
+  gnu/packages/gnutls.scm			\
+  gnu/packages/gperf.scm			\
+  gnu/packages/gsasl.scm			\
+  gnu/packages/guile.scm			\
+  gnu/packages/help2man.scm			\
+  gnu/packages/icu4c.scm			\
+  gnu/packages/idutils.scm			\
+  gnu/packages/indent.scm			\
+  gnu/packages/ld-wrapper.scm			\
+  gnu/packages/less.scm				\
+  gnu/packages/libffi.scm			\
+  gnu/packages/libidn.scm			\
+  gnu/packages/libjpeg.scm			\
+  gnu/packages/libsigsegv.scm			\
+  gnu/packages/libtiff.scm			\
+  gnu/packages/libunistring.scm			\
+  gnu/packages/libusb.scm			\
+  gnu/packages/linux.scm			\
+  gnu/packages/lout.scm				\
+  gnu/packages/lsh.scm				\
+  gnu/packages/m4.scm				\
+  gnu/packages/mailutils.scm			\
+  gnu/packages/make-bootstrap.scm		\
+  gnu/packages/mit-krb5.scm			\
+  gnu/packages/multiprecision.scm		\
+  gnu/packages/mysql.scm			\
+  gnu/packages/nano.scm				\
+  gnu/packages/ncurses.scm			\
+  gnu/packages/nettle.scm			\
+  gnu/packages/openssl.scm			\
+  gnu/packages/perl.scm				\
+  gnu/packages/pkg-config.scm			\
+  gnu/packages/pth.scm				\
+  gnu/packages/python.scm			\
+  gnu/packages/readline.scm			\
+  gnu/packages/recutils.scm			\
+  gnu/packages/rsync.scm			\
+  gnu/packages/scheme.scm			\
+  gnu/packages/shishi.scm			\
+  gnu/packages/system.scm			\
+  gnu/packages/tcl.scm				\
+  gnu/packages/texinfo.scm			\
+  gnu/packages/time.scm				\
+  gnu/packages/wget.scm				\
+  gnu/packages/which.scm			\
+  gnu/packages/xml.scm				\
+  gnu/packages/zile.scm
 
 
 GOBJECTS = $(MODULES:%.scm=%.go) guix/config.go
 
 nobase_dist_guilemodule_DATA = $(MODULES)
 
-patchdir = $(guilemoduledir)/distro/packages/patches
+patchdir = $(guilemoduledir)/gnu/packages/patches
 dist_patch_DATA =						\
-  distro/packages/patches/bigloo-gc-shebangs.patch		\
-  distro/packages/patches/binutils-ld-new-dtags.patch		\
-  distro/packages/patches/cpio-gets-undeclared.patch		\
-  distro/packages/patches/diffutils-gets-undeclared.patch	\
-  distro/packages/patches/emacs-configure-sh.patch		\
-  distro/packages/patches/flex-bison-tests.patch		\
-  distro/packages/patches/gawk-shell.patch			\
-  distro/packages/patches/gettext-gets-undeclared.patch		\
-  distro/packages/patches/glibc-bootstrap-system.patch		\
-  distro/packages/patches/glibc-no-ld-so-cache.patch		\
-  distro/packages/patches/guile-1.8-cpp-4.5.patch		\
-  distro/packages/patches/guile-default-utf8.patch		\
-  distro/packages/patches/guile-relocatable.patch		\
-  distro/packages/patches/libtool-skip-tests.patch		\
-  distro/packages/patches/lsh-guile-compat.patch		\
-  distro/packages/patches/lsh-no-root-login.patch		\
-  distro/packages/patches/lsh-pam-service-name.patch		\
-  distro/packages/patches/m4-gets-undeclared.patch		\
-  distro/packages/patches/m4-readlink-EINVAL.patch		\
-  distro/packages/patches/m4-s_isdir.patch			\
-  distro/packages/patches/make-impure-dirs.patch		\
-  distro/packages/patches/findutils-absolute-paths.patch	\
-  distro/packages/patches/perl-no-sys-dirs.patch		\
-  distro/packages/patches/procps-make-3.82.patch		\
-  distro/packages/patches/readline-link-ncurses.patch		\
-  distro/packages/patches/shishi-gets-undeclared.patch		\
-  distro/packages/patches/tar-gets-undeclared.patch
+  gnu/packages/patches/bigloo-gc-shebangs.patch		\
+  gnu/packages/patches/binutils-ld-new-dtags.patch		\
+  gnu/packages/patches/cpio-gets-undeclared.patch		\
+  gnu/packages/patches/diffutils-gets-undeclared.patch	\
+  gnu/packages/patches/emacs-configure-sh.patch		\
+  gnu/packages/patches/flex-bison-tests.patch		\
+  gnu/packages/patches/gawk-shell.patch			\
+  gnu/packages/patches/gettext-gets-undeclared.patch		\
+  gnu/packages/patches/glibc-bootstrap-system.patch		\
+  gnu/packages/patches/glibc-no-ld-so-cache.patch		\
+  gnu/packages/patches/guile-1.8-cpp-4.5.patch		\
+  gnu/packages/patches/guile-default-utf8.patch		\
+  gnu/packages/patches/guile-relocatable.patch		\
+  gnu/packages/patches/libtool-skip-tests.patch		\
+  gnu/packages/patches/lsh-guile-compat.patch		\
+  gnu/packages/patches/lsh-no-root-login.patch		\
+  gnu/packages/patches/lsh-pam-service-name.patch		\
+  gnu/packages/patches/m4-gets-undeclared.patch		\
+  gnu/packages/patches/m4-readlink-EINVAL.patch		\
+  gnu/packages/patches/m4-s_isdir.patch			\
+  gnu/packages/patches/make-impure-dirs.patch		\
+  gnu/packages/patches/findutils-absolute-paths.patch	\
+  gnu/packages/patches/perl-no-sys-dirs.patch		\
+  gnu/packages/patches/procps-make-3.82.patch		\
+  gnu/packages/patches/readline-link-ncurses.patch		\
+  gnu/packages/patches/shishi-gets-undeclared.patch		\
+  gnu/packages/patches/tar-gets-undeclared.patch
 
-bootstrapdir = $(guilemoduledir)/distro/packages/bootstrap
+bootstrapdir = $(guilemoduledir)/gnu/packages/bootstrap
 bootstrap_x86_64_linuxdir = $(bootstrapdir)/x86_64-linux
 bootstrap_i686_linuxdir = $(bootstrapdir)/i686-linux
 
 dist_bootstrap_x86_64_linux_DATA =		\
-  distro/packages/bootstrap/x86_64-linux/bash	\
-  distro/packages/bootstrap/x86_64-linux/mkdir	\
-  distro/packages/bootstrap/x86_64-linux/tar	\
-  distro/packages/bootstrap/x86_64-linux/xz
+  gnu/packages/bootstrap/x86_64-linux/bash	\
+  gnu/packages/bootstrap/x86_64-linux/mkdir	\
+  gnu/packages/bootstrap/x86_64-linux/tar	\
+  gnu/packages/bootstrap/x86_64-linux/xz
 
 dist_bootstrap_i686_linux_DATA =		\
-  distro/packages/bootstrap/i686-linux/bash	\
-  distro/packages/bootstrap/i686-linux/mkdir	\
-  distro/packages/bootstrap/i686-linux/tar	\
-  distro/packages/bootstrap/i686-linux/xz
+  gnu/packages/bootstrap/i686-linux/bash	\
+  gnu/packages/bootstrap/i686-linux/mkdir	\
+  gnu/packages/bootstrap/i686-linux/tar	\
+  gnu/packages/bootstrap/i686-linux/xz
 
 # Big bootstrap binaries are not included in the tarball.  Instead, they
 # are downloaded.
 nodist_bootstrap_x86_64_linux_DATA =					\
-  distro/packages/bootstrap/x86_64-linux/guile-2.0.7.tar.xz
+  gnu/packages/bootstrap/x86_64-linux/guile-2.0.7.tar.xz
 nodist_bootstrap_i686_linux_DATA =					\
-  distro/packages/bootstrap/i686-linux/guile-2.0.7.tar.xz
+  gnu/packages/bootstrap/i686-linux/guile-2.0.7.tar.xz
 
 # Those files must remain executable, so they remain executable once
 # imported into the store.
@@ -193,10 +193,10 @@ DOWNLOAD_FILE =								\
   $(GUILE) --no-auto-compile -L "$(top_builddir)" -L "$(top_srcdir)"	\
            "$(top_srcdir)/build-aux/download.scm"
 
-distro/packages/bootstrap/x86_64-linux/guile-2.0.7.tar.xz:
+gnu/packages/bootstrap/x86_64-linux/guile-2.0.7.tar.xz:
 	$(MKDIR_P) `dirname "$@"`
 	$(DOWNLOAD_FILE) "$@" "bc43210dcd146d242bef4d354b0aeac12c4ef3118c07502d17ffa8d49e15aa2c"
-distro/packages/bootstrap/i686-linux/guile-2.0.7.tar.xz:
+gnu/packages/bootstrap/i686-linux/guile-2.0.7.tar.xz:
 	$(MKDIR_P) `dirname "$@"`
 	$(DOWNLOAD_FILE) "$@" "f9a7c6f4c556eaafa2a69bcf07d4ffbb6682ea831d4c9da9ba095aca3ccd217c"
 
diff --git a/distro.scm b/distro.scm
index c2d3d1fa40..3973584815 100644
--- a/distro.scm
+++ b/distro.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -47,12 +47,12 @@
 
 (define %patch-path
   (make-parameter
-   (map (cut string-append <>  "/distro/packages/patches")
+   (map (cut string-append <>  "/gnu/packages/patches")
         %load-path)))
 
 (define %bootstrap-binaries-path
   (make-parameter
-   (map (cut string-append <> "/distro/packages/bootstrap")
+   (map (cut string-append <> "/gnu/packages/bootstrap")
         %load-path)))
 
 (define (search-patch file-name)
@@ -65,9 +65,9 @@
                (string-append system "/" file-name)))
 
 (define %distro-module-directory
-  ;; Absolute path of the (distro ...) module root.
+  ;; Absolute path of the (gnu packages ...) module root.
   (string-append (dirname (search-path %load-path "distro.scm"))
-                 "/distro/packages"))
+                 "/gnu/packages"))
 
 (define (package-files)
   "Return the list of files that implement distro modules."
diff --git a/distro/packages/acl.scm b/gnu/packages/acl.scm
index 068789b562..1cba608c8c 100644
--- a/distro/packages/acl.scm
+++ b/gnu/packages/acl.scm
@@ -16,11 +16,11 @@
 ;;; 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 (distro packages acl)
+(define-module (gnu packages acl)
   #:use-module (guix licenses)
-  #:use-module (distro packages attr)
-  #:use-module (distro packages perl)
-  #:use-module ((distro packages gettext)
+  #:use-module (gnu packages attr)
+  #:use-module (gnu packages perl)
+  #:use-module ((gnu packages gettext)
                 #:renamer (symbol-prefix-proc 'guix:))
   #:use-module (guix packages)
   #:use-module (guix download)
diff --git a/distro/packages/algebra.scm b/gnu/packages/algebra.scm
index 7bbdd6c092..088e32bc0c 100644
--- a/distro/packages/algebra.scm
+++ b/gnu/packages/algebra.scm
@@ -17,12 +17,12 @@
 ;;; 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 (distro packages algebra)
+(define-module (gnu packages algebra)
   #:use-module (distro)
-  #:use-module (distro packages multiprecision)
-  #:use-module (distro packages perl)
-  #:use-module (distro packages readline)
-  #:use-module (distro packages flex)
+  #:use-module (gnu packages multiprecision)
+  #:use-module (gnu packages perl)
+  #:use-module (gnu packages readline)
+  #:use-module (gnu packages flex)
   #:use-module (guix licenses)
   #:use-module (guix packages)
   #:use-module (guix download)
diff --git a/distro/packages/aspell.scm b/gnu/packages/aspell.scm
index a4c14c092c..ca0218d814 100644
--- a/distro/packages/aspell.scm
+++ b/gnu/packages/aspell.scm
@@ -16,12 +16,12 @@
 ;;; 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 (distro packages aspell)
+(define-module (gnu packages aspell)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
   #:use-module (guix licenses)
-  #:use-module (distro packages perl))
+  #:use-module (gnu packages perl))
 
 (define-public aspell
   (package
diff --git a/distro/packages/attr.scm b/gnu/packages/attr.scm
index ae0d257dbe..2f8a0e0e65 100644
--- a/distro/packages/attr.scm
+++ b/gnu/packages/attr.scm
@@ -17,10 +17,10 @@
 ;;; 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 (distro packages attr)
+(define-module (gnu packages attr)
   #:use-module (guix licenses)
-  #:use-module (distro packages perl)
-  #:use-module ((distro packages gettext)
+  #:use-module (gnu packages perl)
+  #:use-module ((gnu packages gettext)
                 #:renamer (symbol-prefix-proc 'guix:))
   #:use-module (guix packages)
   #:use-module (guix download)
diff --git a/distro/packages/autotools.scm b/gnu/packages/autotools.scm
index 06568b2224..b5c8b6ec87 100644
--- a/distro/packages/autotools.scm
+++ b/gnu/packages/autotools.scm
@@ -17,11 +17,11 @@
 ;;; 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 (distro packages autotools)
+(define-module (gnu packages autotools)
   #:use-module (guix licenses)
   #:use-module (distro)
-  #:use-module (distro packages perl)
-  #:use-module (distro packages m4)
+  #:use-module (gnu packages perl)
+  #:use-module (gnu packages m4)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu))
diff --git a/distro/packages/base.scm b/gnu/packages/base.scm
index bc705f16e7..b5a5856609 100644
--- a/distro/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -17,18 +17,18 @@
 ;;; 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 (distro packages base)
+(define-module (gnu packages base)
   #:use-module (guix licenses)
   #:use-module (distro)
-  #:use-module (distro packages acl)
-  #:use-module (distro packages bash)
-  #:use-module (distro packages bootstrap)
-  #:use-module (distro packages compression)
-  #:use-module (distro packages gawk)
-  #:use-module (distro packages guile)
-  #:use-module (distro packages multiprecision)
-  #:use-module (distro packages perl)
-  #:use-module (distro packages linux)
+  #:use-module (gnu packages acl)
+  #:use-module (gnu packages bash)
+  #:use-module (gnu packages bootstrap)
+  #:use-module (gnu packages compression)
+  #:use-module (gnu packages gawk)
+  #:use-module (gnu packages guile)
+  #:use-module (gnu packages multiprecision)
+  #:use-module (gnu packages perl)
+  #:use-module (gnu packages linux)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
@@ -978,7 +978,7 @@ exec ~a/bin/~a-gcc -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
               ("guile"    ,%bootstrap-guile)
               ("bash"     ,@(assoc-ref %boot2-inputs "bash"))
               ("wrapper"  ,(search-path %load-path
-                                        "distro/packages/ld-wrapper.scm"))))
+                                        "gnu/packages/ld-wrapper.scm"))))
     (arguments
      `(#:guile ,%bootstrap-guile
        #:modules ((guix build utils))
diff --git a/distro/packages/bash.scm b/gnu/packages/bash.scm
index 0306c7197e..d74315ad18 100644
--- a/distro/packages/bash.scm
+++ b/gnu/packages/bash.scm
@@ -16,10 +16,10 @@
 ;;; 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 (distro packages bash)
+(define-module (gnu packages bash)
   #:use-module (guix licenses)
-  #:use-module (distro packages ncurses)
-  #:use-module (distro packages readline)
+  #:use-module (gnu packages ncurses)
+  #:use-module (gnu packages readline)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix utils)
diff --git a/distro/packages/bdb.scm b/gnu/packages/bdb.scm
index 93bf290231..1be57b302a 100644
--- a/distro/packages/bdb.scm
+++ b/gnu/packages/bdb.scm
@@ -16,7 +16,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 (distro packages bdb)
+(define-module (gnu packages bdb)
   #:use-module (distro)
   #:use-module (guix licenses)
   #:use-module (guix packages)
diff --git a/distro/packages/bdw-gc.scm b/gnu/packages/bdw-gc.scm
index 5a397eaaa3..65c2fd99ce 100644
--- a/distro/packages/bdw-gc.scm
+++ b/gnu/packages/bdw-gc.scm
@@ -16,7 +16,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 (distro packages bdw-gc)
+(define-module (gnu packages bdw-gc)
   #:use-module (guix licenses)
   #:use-module (guix packages)
   #:use-module (guix download)
diff --git a/distro/packages/bison.scm b/gnu/packages/bison.scm
index b3111c30ab..95ffb17522 100644
--- a/distro/packages/bison.scm
+++ b/gnu/packages/bison.scm
@@ -16,13 +16,13 @@
 ;;; 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 (distro packages bison)
+(define-module (gnu packages bison)
   #:use-module (guix licenses)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
-  #:use-module (distro packages m4)
-  #:use-module (distro packages perl))
+  #:use-module (gnu packages m4)
+  #:use-module (gnu packages perl))
 
 (define-public bison
   (package
diff --git a/distro/packages/bootstrap.scm b/gnu/packages/bootstrap.scm
index 27183162b5..6cad933644 100644
--- a/distro/packages/bootstrap.scm
+++ b/gnu/packages/bootstrap.scm
@@ -16,7 +16,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 (distro packages bootstrap)
+(define-module (gnu packages bootstrap)
   #:use-module (guix licenses)
   #:use-module (distro)
   #:use-module (guix packages)
diff --git a/distro/packages/bootstrap/i686-linux/bash b/gnu/packages/bootstrap/i686-linux/bash
index 9882d4adc7..9882d4adc7 100755
--- a/distro/packages/bootstrap/i686-linux/bash
+++ b/gnu/packages/bootstrap/i686-linux/bash
diff --git a/distro/packages/bootstrap/i686-linux/mkdir b/gnu/packages/bootstrap/i686-linux/mkdir
index 0ddab232b7..0ddab232b7 100755
--- a/distro/packages/bootstrap/i686-linux/mkdir
+++ b/gnu/packages/bootstrap/i686-linux/mkdir
diff --git a/distro/packages/bootstrap/i686-linux/tar b/gnu/packages/bootstrap/i686-linux/tar
index 6bee702cf5..6bee702cf5 100755
--- a/distro/packages/bootstrap/i686-linux/tar
+++ b/gnu/packages/bootstrap/i686-linux/tar
diff --git a/distro/packages/bootstrap/i686-linux/xz b/gnu/packages/bootstrap/i686-linux/xz
index 5a126e4fc5..5a126e4fc5 100755
--- a/distro/packages/bootstrap/i686-linux/xz
+++ b/gnu/packages/bootstrap/i686-linux/xz
diff --git a/distro/packages/bootstrap/x86_64-linux/bash b/gnu/packages/bootstrap/x86_64-linux/bash
index 3b0227fbb1..3b0227fbb1 100755
--- a/distro/packages/bootstrap/x86_64-linux/bash
+++ b/gnu/packages/bootstrap/x86_64-linux/bash
diff --git a/distro/packages/bootstrap/x86_64-linux/mkdir b/gnu/packages/bootstrap/x86_64-linux/mkdir
index 7207ad8a46..7207ad8a46 100755
--- a/distro/packages/bootstrap/x86_64-linux/mkdir
+++ b/gnu/packages/bootstrap/x86_64-linux/mkdir
diff --git a/distro/packages/bootstrap/x86_64-linux/tar b/gnu/packages/bootstrap/x86_64-linux/tar
index 9104da7b53..9104da7b53 100755
--- a/distro/packages/bootstrap/x86_64-linux/tar
+++ b/gnu/packages/bootstrap/x86_64-linux/tar
diff --git a/distro/packages/bootstrap/x86_64-linux/xz b/gnu/packages/bootstrap/x86_64-linux/xz
index 488e319b37..488e319b37 100755
--- a/distro/packages/bootstrap/x86_64-linux/xz
+++ b/gnu/packages/bootstrap/x86_64-linux/xz
diff --git a/distro/packages/check.scm b/gnu/packages/check.scm
index 49197cc135..ec2997cbe6 100644
--- a/distro/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -16,7 +16,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 (distro packages check)
+(define-module (gnu packages check)
   #:use-module (distro)
   #:use-module (guix licenses)
   #:use-module (guix packages)
diff --git a/distro/packages/compression.scm b/gnu/packages/compression.scm
index 51a2d70e2d..dc00f323ce 100644
--- a/distro/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -16,7 +16,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 (distro packages compression)
+(define-module (gnu packages compression)
   #:use-module ((guix licenses)
                 #:renamer (symbol-prefix-proc 'license:))
   #:use-module (guix packages)
diff --git a/distro/packages/cpio.scm b/gnu/packages/cpio.scm
index 07c0ec3f53..6fddc3f768 100644
--- a/distro/packages/cpio.scm
+++ b/gnu/packages/cpio.scm
@@ -16,7 +16,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 (distro packages cpio)
+(define-module (gnu packages cpio)
   #:use-module (guix licenses)
   #:use-module (distro)
   #:use-module (guix packages)
diff --git a/distro/packages/cyrus-sasl.scm b/gnu/packages/cyrus-sasl.scm
index 9ce2051a68..fe8ea4ef7c 100644
--- a/distro/packages/cyrus-sasl.scm
+++ b/gnu/packages/cyrus-sasl.scm
@@ -17,11 +17,11 @@
 ;;; 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 (distro packages cyrus-sasl)
+(define-module (gnu packages cyrus-sasl)
   #:use-module (distro)
-  #:use-module (distro packages gdbm)
-  #:use-module (distro packages mit-krb5)
-  #:use-module (distro packages openssl)
+  #:use-module (gnu packages gdbm)
+  #:use-module (gnu packages mit-krb5)
+  #:use-module (gnu packages openssl)
   #:use-module ((guix licenses)
                 #:renamer (symbol-prefix-proc 'license:))
   #:use-module (guix packages)
diff --git a/distro/packages/ddrescue.scm b/gnu/packages/ddrescue.scm
index 97bfd78309..e9c7856af3 100644
--- a/distro/packages/ddrescue.scm
+++ b/gnu/packages/ddrescue.scm
@@ -16,7 +16,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 (distro packages ddrescue)
+(define-module (gnu packages ddrescue)
   #:use-module (guix licenses)
   #:use-module (guix packages)
   #:use-module (guix download)
diff --git a/distro/packages/dejagnu.scm b/gnu/packages/dejagnu.scm
index f350f8a973..1efc7c78e7 100644
--- a/distro/packages/dejagnu.scm
+++ b/gnu/packages/dejagnu.scm
@@ -16,12 +16,12 @@
 ;;; 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 (distro packages dejagnu)
+(define-module (gnu packages dejagnu)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
   #:use-module (guix licenses)
-  #:use-module (distro packages tcl))
+  #:use-module (gnu packages tcl))
 
 (define-public dejagnu
   (package
diff --git a/distro/packages/ed.scm b/gnu/packages/ed.scm
index 614b3ae645..83d8b21bfb 100644
--- a/distro/packages/ed.scm
+++ b/gnu/packages/ed.scm
@@ -16,7 +16,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 (distro packages ed)
+(define-module (gnu packages ed)
   #:use-module (guix licenses)
   #:use-module (guix packages)
   #:use-module (guix download)
diff --git a/distro/packages/emacs.scm b/gnu/packages/emacs.scm
index 5a3d3f3910..c9d0822a80 100644
--- a/distro/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -16,16 +16,16 @@
 ;;; 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 (distro packages emacs)
+(define-module (gnu packages emacs)
   #:use-module (guix licenses)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
   #:use-module (distro)
-  #:use-module (distro packages ncurses)
-  #:use-module (distro packages texinfo)
-  #:use-module (distro packages gnutls)
-  #:use-module (distro packages pkg-config))
+  #:use-module (gnu packages ncurses)
+  #:use-module (gnu packages texinfo)
+  #:use-module (gnu packages gnutls)
+  #:use-module (gnu packages pkg-config))
 
 (define-public emacs
   (package
diff --git a/distro/packages/file.scm b/gnu/packages/file.scm
index 61bdd71cfe..5a2cc2ad80 100644
--- a/distro/packages/file.scm
+++ b/gnu/packages/file.scm
@@ -16,7 +16,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 (distro packages file)
+(define-module (gnu packages file)
   #:use-module (distro)
   #:use-module (guix licenses)
   #:use-module (guix packages)
diff --git a/distro/packages/flex.scm b/gnu/packages/flex.scm
index 2cfdbfe23a..7a6d5f507d 100644
--- a/distro/packages/flex.scm
+++ b/gnu/packages/flex.scm
@@ -16,15 +16,15 @@
 ;;; 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 (distro packages flex)
+(define-module (gnu packages flex)
   #:use-module (guix licenses)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
   #:use-module (distro)
-  #:use-module (distro packages m4)
-  #:use-module (distro packages bison)
-  #:use-module (distro packages indent))
+  #:use-module (gnu packages m4)
+  #:use-module (gnu packages bison)
+  #:use-module (gnu packages indent))
 
 (define-public flex
   (package
diff --git a/distro/packages/gawk.scm b/gnu/packages/gawk.scm
index 6fed7f8b70..802042665a 100644
--- a/distro/packages/gawk.scm
+++ b/gnu/packages/gawk.scm
@@ -16,9 +16,9 @@
 ;;; 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 (distro packages gawk)
+(define-module (gnu packages gawk)
   #:use-module (guix licenses)
-  #:use-module (distro packages libsigsegv)
+  #:use-module (gnu packages libsigsegv)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix utils)
diff --git a/distro/packages/gdb.scm b/gnu/packages/gdb.scm
index 4540c04099..c8c771bfd5 100644
--- a/distro/packages/gdb.scm
+++ b/gnu/packages/gdb.scm
@@ -16,14 +16,14 @@
 ;;; 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 (distro packages gdb)
-  #:use-module (distro packages ncurses)
-  #:use-module (distro packages readline)
-  #:use-module (distro packages dejagnu)
-  #:use-module (distro packages texinfo)
-  #:use-module (distro packages multiprecision)
-  #:use-module (distro packages xml)
-  #:use-module (distro packages python)
+(define-module (gnu packages gdb)
+  #:use-module (gnu packages ncurses)
+  #:use-module (gnu packages readline)
+  #:use-module (gnu packages dejagnu)
+  #:use-module (gnu packages texinfo)
+  #:use-module (gnu packages multiprecision)
+  #:use-module (gnu packages xml)
+  #:use-module (gnu packages python)
   #:use-module ((guix licenses) #:select (gpl3+))
   #:use-module (guix packages)
   #:use-module (guix download)
diff --git a/distro/packages/gdbm.scm b/gnu/packages/gdbm.scm
index 47f1b95e95..588b732b02 100644
--- a/distro/packages/gdbm.scm
+++ b/gnu/packages/gdbm.scm
@@ -16,7 +16,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 (distro packages gdbm)
+(define-module (gnu packages gdbm)
   #:use-module (guix licenses)
   #:use-module (guix packages)
   #:use-module (guix download)
diff --git a/distro/packages/gettext.scm b/gnu/packages/gettext.scm
index e4d4acc615..c45a488dca 100644
--- a/distro/packages/gettext.scm
+++ b/gnu/packages/gettext.scm
@@ -16,7 +16,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 (distro packages gettext)
+(define-module (gnu packages gettext)
   #:use-module (guix licenses)
   #:use-module (distro)
   #:use-module (guix packages)
diff --git a/distro/packages/global.scm b/gnu/packages/global.scm
index ddd28c2887..705efbbbed 100644
--- a/distro/packages/global.scm
+++ b/gnu/packages/global.scm
@@ -16,13 +16,13 @@
 ;;; 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 (distro packages global)
+(define-module (gnu packages global)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
   #:use-module (guix licenses)
-  #:use-module (distro packages ncurses)
-  #:use-module (distro packages autotools)
+  #:use-module (gnu packages ncurses)
+  #:use-module (gnu packages autotools)
   #:use-module (distro))
 
 (define-public global                             ; a global variable
diff --git a/distro/packages/gnupg.scm b/gnu/packages/gnupg.scm
index 5fdf19187d..82f8d26a65 100644
--- a/distro/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -16,11 +16,11 @@
 ;;; 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 (distro packages gnupg)
+(define-module (gnu packages gnupg)
   #:use-module (guix licenses)
-  #:use-module (distro packages pth)
-  #:use-module (distro packages readline)
-  #:use-module ((distro packages compression)
+  #:use-module (gnu packages pth)
+  #:use-module (gnu packages readline)
+  #:use-module ((gnu packages compression)
                 #:renamer (symbol-prefix-proc 'guix:))
   #:use-module (guix packages)
   #:use-module (guix download)
diff --git a/distro/packages/gnutls.scm b/gnu/packages/gnutls.scm
index 269907e7c4..4bda9a9ac5 100644
--- a/distro/packages/gnutls.scm
+++ b/gnu/packages/gnutls.scm
@@ -16,18 +16,18 @@
 ;;; 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 (distro packages gnutls)
+(define-module (gnu packages gnutls)
   #:use-module (guix licenses)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
-  #:use-module (distro packages base)
-  #:use-module ((distro packages compression)
+  #:use-module (gnu packages base)
+  #:use-module ((gnu packages compression)
                 #:renamer (symbol-prefix-proc 'guix:))
-  #:use-module (distro packages nettle)
-  #:use-module (distro packages guile)
-  #:use-module (distro packages perl)
-  #:use-module (distro packages which))
+  #:use-module (gnu packages nettle)
+  #:use-module (gnu packages guile)
+  #:use-module (gnu packages perl)
+  #:use-module (gnu packages which))
 
 (define-public libtasn1
   (package
diff --git a/distro/packages/gperf.scm b/gnu/packages/gperf.scm
index f1827e0a65..94fa62b652 100644
--- a/distro/packages/gperf.scm
+++ b/gnu/packages/gperf.scm
@@ -16,7 +16,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 (distro packages gperf)
+(define-module (gnu packages gperf)
   #:use-module (guix licenses)
   #:use-module (guix packages)
   #:use-module (guix download)
diff --git a/distro/packages/gsasl.scm b/gnu/packages/gsasl.scm
index 43530b57ad..dc75b18455 100644
--- a/distro/packages/gsasl.scm
+++ b/gnu/packages/gsasl.scm
@@ -16,14 +16,14 @@
 ;;; 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 (distro packages gsasl)
+(define-module (gnu packages gsasl)
   #:use-module (distro)
-  #:use-module ((distro packages compression)
+  #:use-module ((gnu packages compression)
                 #:renamer (symbol-prefix-proc 'guix:))
-  #:use-module (distro packages gnutls)
-  #:use-module (distro packages libidn)
-  #:use-module (distro packages nettle)
-  #:use-module (distro packages shishi)
+  #:use-module (gnu packages gnutls)
+  #:use-module (gnu packages libidn)
+  #:use-module (gnu packages nettle)
+  #:use-module (gnu packages shishi)
   #:use-module (guix licenses)
   #:use-module (guix packages)
   #:use-module (guix download)
diff --git a/distro/packages/guile.scm b/gnu/packages/guile.scm
index 9964f9d9f0..5034ae914a 100644
--- a/distro/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -16,19 +16,19 @@
 ;;; 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 (distro packages guile)
+(define-module (gnu packages guile)
   #:use-module (guix licenses)
   #:use-module (distro)
-  #:use-module (distro packages bdw-gc)
-  #:use-module (distro packages gawk)
-  #:use-module (distro packages gperf)
-  #:use-module (distro packages libffi)
-  #:use-module (distro packages autotools)
-  #:use-module (distro packages libunistring)
-  #:use-module (distro packages m4)
-  #:use-module (distro packages multiprecision)
-  #:use-module (distro packages pkg-config)
-  #:use-module (distro packages readline)
+  #:use-module (gnu packages bdw-gc)
+  #:use-module (gnu packages gawk)
+  #:use-module (gnu packages gperf)
+  #:use-module (gnu packages libffi)
+  #:use-module (gnu packages autotools)
+  #:use-module (gnu packages libunistring)
+  #:use-module (gnu packages m4)
+  #:use-module (gnu packages multiprecision)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages readline)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu))
diff --git a/distro/packages/help2man.scm b/gnu/packages/help2man.scm
index 191ef25c85..0acd39a524 100644
--- a/distro/packages/help2man.scm
+++ b/gnu/packages/help2man.scm
@@ -16,12 +16,12 @@
 ;;; 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 (distro packages help2man)
+(define-module (gnu packages help2man)
   #:use-module (guix licenses)
   #:use-module (guix download)
   #:use-module (guix packages)
   #:use-module (guix build-system gnu)
-  #:use-module (distro packages perl))
+  #:use-module (gnu packages perl))
 
 (define-public help2man
   (package
diff --git a/distro/packages/icu4c.scm b/gnu/packages/icu4c.scm
index f0adb8f2ce..e0aa3bcd88 100644
--- a/distro/packages/icu4c.scm
+++ b/gnu/packages/icu4c.scm
@@ -16,9 +16,9 @@
 ;;; 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 (distro packages icu4c)
+(define-module (gnu packages icu4c)
   #:use-module (distro)
-  #:use-module (distro packages perl)
+  #:use-module (gnu packages perl)
   #:use-module (guix licenses)
   #:use-module (guix packages)
   #:use-module (guix download)
diff --git a/distro/packages/idutils.scm b/gnu/packages/idutils.scm
index f4c7005f99..34b6dfcff9 100644
--- a/distro/packages/idutils.scm
+++ b/gnu/packages/idutils.scm
@@ -16,7 +16,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 (distro packages idutils)
+(define-module (gnu packages idutils)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
diff --git a/distro/packages/indent.scm b/gnu/packages/indent.scm
index d69a42f978..eb42e6a7b4 100644
--- a/distro/packages/indent.scm
+++ b/gnu/packages/indent.scm
@@ -16,7 +16,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 (distro packages indent)
+(define-module (gnu packages indent)
   #:use-module (distro)
   #:use-module (guix licenses)
   #:use-module (guix packages)
diff --git a/distro/packages/ld-wrapper.scm b/gnu/packages/ld-wrapper.scm
index fd5a4cbd0c..fd5a4cbd0c 100644
--- a/distro/packages/ld-wrapper.scm
+++ b/gnu/packages/ld-wrapper.scm
diff --git a/distro/packages/less.scm b/gnu/packages/less.scm
index 1f05b50e1e..63a3d98a9b 100644
--- a/distro/packages/less.scm
+++ b/gnu/packages/less.scm
@@ -16,9 +16,9 @@
 ;;; 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 (distro packages less)
+(define-module (gnu packages less)
   #:use-module (guix licenses)
-  #:use-module (distro packages ncurses)
+  #:use-module (gnu packages ncurses)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu))
diff --git a/distro/packages/libffi.scm b/gnu/packages/libffi.scm
index 0900a43cb4..87c849e564 100644
--- a/distro/packages/libffi.scm
+++ b/gnu/packages/libffi.scm
@@ -16,7 +16,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 (distro packages libffi)
+(define-module (gnu packages libffi)
   #:use-module (guix licenses)
   #:use-module (guix packages)
   #:use-module (guix download)
diff --git a/distro/packages/libidn.scm b/gnu/packages/libidn.scm
index dbae143b3a..dd246ef3e1 100644
--- a/distro/packages/libidn.scm
+++ b/gnu/packages/libidn.scm
@@ -16,7 +16,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 (distro packages libidn)
+(define-module (gnu packages libidn)
   #:use-module (distro)
   #:use-module (guix licenses)
   #:use-module (guix packages)
diff --git a/distro/packages/libjpeg.scm b/gnu/packages/libjpeg.scm
index c343771fb0..22d5a6b1c1 100644
--- a/distro/packages/libjpeg.scm
+++ b/gnu/packages/libjpeg.scm
@@ -16,7 +16,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 (distro packages libjpeg)
+(define-module (gnu packages libjpeg)
   #:use-module (distro)
   #:use-module (guix licenses)
   #:use-module (guix packages)
diff --git a/distro/packages/libsigsegv.scm b/gnu/packages/libsigsegv.scm
index a21e2064c7..de896e4e8b 100644
--- a/distro/packages/libsigsegv.scm
+++ b/gnu/packages/libsigsegv.scm
@@ -16,7 +16,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 (distro packages libsigsegv)
+(define-module (gnu packages libsigsegv)
   #:use-module (guix licenses)
   #:use-module (guix packages)
   #:use-module (guix download)
diff --git a/distro/packages/libtiff.scm b/gnu/packages/libtiff.scm
index b5a12c53e2..0e785a622b 100644
--- a/distro/packages/libtiff.scm
+++ b/gnu/packages/libtiff.scm
@@ -16,10 +16,10 @@
 ;;; 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 (distro packages libtiff)
+(define-module (gnu packages libtiff)
   #:use-module (distro)
-  #:use-module (distro packages file)
-  #:use-module (distro packages libjpeg)
+  #:use-module (gnu packages file)
+  #:use-module (gnu packages libjpeg)
   #:use-module (guix licenses)
   #:use-module (guix packages)
   #:use-module (guix download)
diff --git a/distro/packages/libunistring.scm b/gnu/packages/libunistring.scm
index 1359f9d488..62ade5e378 100644
--- a/distro/packages/libunistring.scm
+++ b/gnu/packages/libunistring.scm
@@ -16,7 +16,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 (distro packages libunistring)
+(define-module (gnu packages libunistring)
   #:use-module (guix licenses)
   #:use-module (guix packages)
   #:use-module (guix download)
diff --git a/distro/packages/libusb.scm b/gnu/packages/libusb.scm
index eb7edb40e1..1813f0cd04 100644
--- a/distro/packages/libusb.scm
+++ b/gnu/packages/libusb.scm
@@ -16,7 +16,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 (distro packages libusb)
+(define-module (gnu packages libusb)
   #:use-module (distro)
   #:use-module (guix licenses)
   #:use-module (guix packages)
diff --git a/distro/packages/linux.scm b/gnu/packages/linux.scm
index 534aac11ab..ded36c5eec 100644
--- a/distro/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -17,16 +17,16 @@
 ;;; 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 (distro packages linux)
+(define-module (gnu packages linux)
   #:use-module (guix licenses)
   #:use-module (distro)
-  #:use-module ((distro packages compression)
+  #:use-module ((gnu packages compression)
                 #:renamer (symbol-prefix-proc 'guix:))
-  #:use-module (distro packages flex)
-  #:use-module (distro packages libusb)
-  #:use-module (distro packages ncurses)
-  #:use-module (distro packages perl)
-  #:use-module (distro packages pkg-config)
+  #:use-module (gnu packages flex)
+  #:use-module (gnu packages libusb)
+  #:use-module (gnu packages ncurses)
+  #:use-module (gnu packages perl)
+  #:use-module (gnu packages pkg-config)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu))
diff --git a/distro/packages/lout.scm b/gnu/packages/lout.scm
index d3ff390b46..b95b694ab4 100644
--- a/distro/packages/lout.scm
+++ b/gnu/packages/lout.scm
@@ -16,7 +16,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 (distro packages lout)
+(define-module (gnu packages lout)
   #:use-module (guix licenses)
   #:use-module (guix packages)
   #:use-module (guix download)
diff --git a/distro/packages/lsh.scm b/gnu/packages/lsh.scm
index d2c2d9082d..b42eb24639 100644
--- a/distro/packages/lsh.scm
+++ b/gnu/packages/lsh.scm
@@ -16,20 +16,20 @@
 ;;; 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 (distro packages lsh)
+(define-module (gnu packages lsh)
   #:use-module (guix licenses)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
   #:use-module (distro)
-  #:use-module (distro packages m4)
-  #:use-module (distro packages linux)
-  #:use-module ((distro packages compression)
+  #:use-module (gnu packages m4)
+  #:use-module (gnu packages linux)
+  #:use-module ((gnu packages compression)
                 #:renamer (symbol-prefix-proc 'guix:))
-  #:use-module (distro packages multiprecision)
-  #:use-module (distro packages readline)
-  #:use-module (distro packages gperf)
-  #:use-module (distro packages base))
+  #:use-module (gnu packages multiprecision)
+  #:use-module (gnu packages readline)
+  #:use-module (gnu packages gperf)
+  #:use-module (gnu packages base))
 
 (define-public liboop
   (package
diff --git a/distro/packages/m4.scm b/gnu/packages/m4.scm
index 7f2bed3ab7..bac8d02c85 100644
--- a/distro/packages/m4.scm
+++ b/gnu/packages/m4.scm
@@ -16,7 +16,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 (distro packages m4)
+(define-module (gnu packages m4)
   #:use-module (guix licenses)
   #:use-module (distro)
   #:use-module (guix packages)
diff --git a/distro/packages/mailutils.scm b/gnu/packages/mailutils.scm
index 55b40f5974..f6d46aaf34 100644
--- a/distro/packages/mailutils.scm
+++ b/gnu/packages/mailutils.scm
@@ -16,19 +16,19 @@
 ;;; 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 (distro packages mailutils)
+(define-module (gnu packages mailutils)
   #:use-module (distro)
-  #:use-module (distro packages linux)
-  #:use-module (distro packages gnutls)
-  #:use-module (distro packages gdbm)
-  #:use-module (distro packages guile)
-  #:use-module (distro packages ncurses)
-  #:use-module (distro packages readline)
-  #:use-module (distro packages dejagnu)
-  #:use-module (distro packages m4)
-  #:use-module (distro packages texinfo)
-  #:use-module (distro packages mysql)
-  #:use-module (distro packages autotools)
+  #:use-module (gnu packages linux)
+  #:use-module (gnu packages gnutls)
+  #:use-module (gnu packages gdbm)
+  #:use-module (gnu packages guile)
+  #:use-module (gnu packages ncurses)
+  #:use-module (gnu packages readline)
+  #:use-module (gnu packages dejagnu)
+  #:use-module (gnu packages m4)
+  #:use-module (gnu packages texinfo)
+  #:use-module (gnu packages mysql)
+  #:use-module (gnu packages autotools)
   #:use-module (guix licenses)
   #:use-module (guix packages)
   #:use-module (guix download)
diff --git a/distro/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm
index b1d74ec5d6..20679d2244 100644
--- a/distro/packages/make-bootstrap.scm
+++ b/gnu/packages/make-bootstrap.scm
@@ -16,20 +16,20 @@
 ;;; 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 (distro packages make-bootstrap)
+(define-module (gnu packages make-bootstrap)
   #:use-module (guix utils)
   #:use-module (guix packages)
   #:use-module (guix licenses)
   #:use-module (guix build-system trivial)
   #:use-module (guix build-system gnu)
   #:use-module ((distro) #:select (search-patch))
-  #:use-module (distro packages base)
-  #:use-module (distro packages bash)
-  #:use-module (distro packages compression)
-  #:use-module (distro packages gawk)
-  #:use-module (distro packages guile)
-  #:use-module (distro packages linux)
-  #:use-module (distro packages multiprecision)
+  #:use-module (gnu packages base)
+  #:use-module (gnu packages bash)
+  #:use-module (gnu packages compression)
+  #:use-module (gnu packages gawk)
+  #:use-module (gnu packages guile)
+  #:use-module (gnu packages linux)
+  #:use-module (gnu packages multiprecision)
   #:use-module (ice-9 match)
   #:use-module (srfi srfi-1)
   #:export (%bootstrap-binaries-tarball
@@ -42,7 +42,7 @@
 ;;; Commentary:
 ;;;
 ;;; This modules provides tools to build tarballs of the "bootstrap binaries"
-;;; used in (distro packages bootstrap).  These statically-linked binaries are
+;;; used in (gnu packages bootstrap).  These statically-linked binaries are
 ;;; taken for granted and used as the root of the whole bootstrap procedure.
 ;;;
 ;;; Code:
diff --git a/distro/packages/mit-krb5.scm b/gnu/packages/mit-krb5.scm
index 13250ff95b..4b30a7ca17 100644
--- a/distro/packages/mit-krb5.scm
+++ b/gnu/packages/mit-krb5.scm
@@ -16,10 +16,10 @@
 ;;; 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 (distro packages mit-krb5)
+(define-module (gnu packages mit-krb5)
   #:use-module (distro)
-  #:use-module (distro packages bison)
-  #:use-module (distro packages perl)
+  #:use-module (gnu packages bison)
+  #:use-module (gnu packages perl)
   #:use-module (guix licenses)
   #:use-module (guix packages)
   #:use-module (guix download)
diff --git a/distro/packages/multiprecision.scm b/gnu/packages/multiprecision.scm
index 444c6103eb..f05fe1994e 100644
--- a/distro/packages/multiprecision.scm
+++ b/gnu/packages/multiprecision.scm
@@ -16,10 +16,10 @@
 ;;; 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 (distro packages multiprecision)
+(define-module (gnu packages multiprecision)
   #:use-module (guix licenses)
   #:use-module (distro)
-  #:use-module (distro packages m4)
+  #:use-module (gnu packages m4)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix utils)
diff --git a/distro/packages/mysql.scm b/gnu/packages/mysql.scm
index d98271a78b..517f65610e 100644
--- a/distro/packages/mysql.scm
+++ b/gnu/packages/mysql.scm
@@ -16,13 +16,13 @@
 ;;; 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 (distro packages mysql)
+(define-module (gnu packages mysql)
   #:use-module (distro)
-  #:use-module (distro packages perl)
-  #:use-module (distro packages linux)
-  #:use-module (distro packages openssl)
-  #:use-module (distro packages compression)
-  #:use-module (distro packages ncurses)
+  #:use-module (gnu packages perl)
+  #:use-module (gnu packages linux)
+  #:use-module (gnu packages openssl)
+  #:use-module (gnu packages compression)
+  #:use-module (gnu packages ncurses)
   #:use-module ((guix licenses) #:select (gpl2))
   #:use-module (guix packages)
   #:use-module (guix download)
diff --git a/distro/packages/nano.scm b/gnu/packages/nano.scm
index f51702f4f2..09fbe7f168 100644
--- a/distro/packages/nano.scm
+++ b/gnu/packages/nano.scm
@@ -16,11 +16,11 @@
 ;;; 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 (distro packages nano)
+(define-module (gnu packages nano)
   #:use-module (guix licenses)
-  #:use-module ((distro packages gettext)
+  #:use-module ((gnu packages gettext)
                 #:renamer (symbol-prefix-proc 'guix:))
-  #:use-module (distro packages ncurses)
+  #:use-module (gnu packages ncurses)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu))
diff --git a/distro/packages/ncurses.scm b/gnu/packages/ncurses.scm
index 938d1dc2c4..1be2551a63 100644
--- a/distro/packages/ncurses.scm
+++ b/gnu/packages/ncurses.scm
@@ -16,7 +16,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 (distro packages ncurses)
+(define-module (gnu packages ncurses)
   #:use-module (guix licenses)
   #:use-module (guix packages)
   #:use-module (guix download)
diff --git a/distro/packages/nettle.scm b/gnu/packages/nettle.scm
index 2f512a36d0..6a0b6ef40a 100644
--- a/distro/packages/nettle.scm
+++ b/gnu/packages/nettle.scm
@@ -16,13 +16,13 @@
 ;;; 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 (distro packages nettle)
+(define-module (gnu packages nettle)
   #:use-module (guix licenses)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
-  #:use-module (distro packages multiprecision)
-  #:use-module (distro packages m4))
+  #:use-module (gnu packages multiprecision)
+  #:use-module (gnu packages m4))
 
 (define-public nettle
   (package
diff --git a/distro/packages/openssl.scm b/gnu/packages/openssl.scm
index 503f593bdd..8c8ba4c668 100644
--- a/distro/packages/openssl.scm
+++ b/gnu/packages/openssl.scm
@@ -16,9 +16,9 @@
 ;;; 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 (distro packages openssl)
+(define-module (gnu packages openssl)
   #:use-module (distro)
-  #:use-module (distro packages perl)
+  #:use-module (gnu packages perl)
   #:use-module ((guix licenses) #:renamer (symbol-prefix-proc 'license:))
   #:use-module (guix packages)
   #:use-module (guix download)
diff --git a/distro/packages/patches/bigloo-gc-shebangs.patch b/gnu/packages/patches/bigloo-gc-shebangs.patch
index 07af261887..07af261887 100644
--- a/distro/packages/patches/bigloo-gc-shebangs.patch
+++ b/gnu/packages/patches/bigloo-gc-shebangs.patch
diff --git a/distro/packages/patches/binutils-ld-new-dtags.patch b/gnu/packages/patches/binutils-ld-new-dtags.patch
index 5f7a03fc38..5f7a03fc38 100644
--- a/distro/packages/patches/binutils-ld-new-dtags.patch
+++ b/gnu/packages/patches/binutils-ld-new-dtags.patch
diff --git a/distro/packages/patches/cpio-gets-undeclared.patch b/gnu/packages/patches/cpio-gets-undeclared.patch
index bc34de6455..bc34de6455 100644
--- a/distro/packages/patches/cpio-gets-undeclared.patch
+++ b/gnu/packages/patches/cpio-gets-undeclared.patch
diff --git a/distro/packages/patches/diffutils-gets-undeclared.patch b/gnu/packages/patches/diffutils-gets-undeclared.patch
index b6cdc77caa..b6cdc77caa 100644
--- a/distro/packages/patches/diffutils-gets-undeclared.patch
+++ b/gnu/packages/patches/diffutils-gets-undeclared.patch
diff --git a/distro/packages/patches/emacs-configure-sh.patch b/gnu/packages/patches/emacs-configure-sh.patch
index fd34d06ced..fd34d06ced 100644
--- a/distro/packages/patches/emacs-configure-sh.patch
+++ b/gnu/packages/patches/emacs-configure-sh.patch
diff --git a/distro/packages/patches/findutils-absolute-paths.patch b/gnu/packages/patches/findutils-absolute-paths.patch
index 96341e281f..96341e281f 100644
--- a/distro/packages/patches/findutils-absolute-paths.patch
+++ b/gnu/packages/patches/findutils-absolute-paths.patch
diff --git a/distro/packages/patches/flex-bison-tests.patch b/gnu/packages/patches/flex-bison-tests.patch
index 0f372f83bf..0f372f83bf 100644
--- a/distro/packages/patches/flex-bison-tests.patch
+++ b/gnu/packages/patches/flex-bison-tests.patch
diff --git a/distro/packages/patches/gawk-shell.patch b/gnu/packages/patches/gawk-shell.patch
index 89b8540a8d..89b8540a8d 100644
--- a/distro/packages/patches/gawk-shell.patch
+++ b/gnu/packages/patches/gawk-shell.patch
diff --git a/distro/packages/patches/gettext-gets-undeclared.patch b/gnu/packages/patches/gettext-gets-undeclared.patch
index 072a8d94ab..072a8d94ab 100644
--- a/distro/packages/patches/gettext-gets-undeclared.patch
+++ b/gnu/packages/patches/gettext-gets-undeclared.patch
diff --git a/distro/packages/patches/glibc-bootstrap-system.patch b/gnu/packages/patches/glibc-bootstrap-system.patch
index 7208cce3f4..7208cce3f4 100644
--- a/distro/packages/patches/glibc-bootstrap-system.patch
+++ b/gnu/packages/patches/glibc-bootstrap-system.patch
diff --git a/distro/packages/patches/glibc-no-ld-so-cache.patch b/gnu/packages/patches/glibc-no-ld-so-cache.patch
index 75fff50b47..75fff50b47 100644
--- a/distro/packages/patches/glibc-no-ld-so-cache.patch
+++ b/gnu/packages/patches/glibc-no-ld-so-cache.patch
diff --git a/distro/packages/patches/guile-1.8-cpp-4.5.patch b/gnu/packages/patches/guile-1.8-cpp-4.5.patch
index 638d071baf..638d071baf 100644
--- a/distro/packages/patches/guile-1.8-cpp-4.5.patch
+++ b/gnu/packages/patches/guile-1.8-cpp-4.5.patch
diff --git a/distro/packages/patches/guile-default-utf8.patch b/gnu/packages/patches/guile-default-utf8.patch
index 409f435161..409f435161 100644
--- a/distro/packages/patches/guile-default-utf8.patch
+++ b/gnu/packages/patches/guile-default-utf8.patch
diff --git a/distro/packages/patches/guile-relocatable.patch b/gnu/packages/patches/guile-relocatable.patch
index 077394cdde..077394cdde 100644
--- a/distro/packages/patches/guile-relocatable.patch
+++ b/gnu/packages/patches/guile-relocatable.patch
diff --git a/distro/packages/patches/libtool-skip-tests.patch b/gnu/packages/patches/libtool-skip-tests.patch
index 6e12615d51..6e12615d51 100644
--- a/distro/packages/patches/libtool-skip-tests.patch
+++ b/gnu/packages/patches/libtool-skip-tests.patch
diff --git a/distro/packages/patches/lsh-guile-compat.patch b/gnu/packages/patches/lsh-guile-compat.patch
index 0fe0484580..0fe0484580 100644
--- a/distro/packages/patches/lsh-guile-compat.patch
+++ b/gnu/packages/patches/lsh-guile-compat.patch
diff --git a/distro/packages/patches/lsh-no-root-login.patch b/gnu/packages/patches/lsh-no-root-login.patch
index 9dd81de3fb..9dd81de3fb 100644
--- a/distro/packages/patches/lsh-no-root-login.patch
+++ b/gnu/packages/patches/lsh-no-root-login.patch
diff --git a/distro/packages/patches/lsh-pam-service-name.patch b/gnu/packages/patches/lsh-pam-service-name.patch
index 6a6156855c..6a6156855c 100644
--- a/distro/packages/patches/lsh-pam-service-name.patch
+++ b/gnu/packages/patches/lsh-pam-service-name.patch
diff --git a/distro/packages/patches/m4-gets-undeclared.patch b/gnu/packages/patches/m4-gets-undeclared.patch
index d28f0cdcc4..d28f0cdcc4 100644
--- a/distro/packages/patches/m4-gets-undeclared.patch
+++ b/gnu/packages/patches/m4-gets-undeclared.patch
diff --git a/distro/packages/patches/m4-readlink-EINVAL.patch b/gnu/packages/patches/m4-readlink-EINVAL.patch
index dd371584a7..dd371584a7 100644
--- a/distro/packages/patches/m4-readlink-EINVAL.patch
+++ b/gnu/packages/patches/m4-readlink-EINVAL.patch
diff --git a/distro/packages/patches/m4-s_isdir.patch b/gnu/packages/patches/m4-s_isdir.patch
index a009a4ba44..a009a4ba44 100644
--- a/distro/packages/patches/m4-s_isdir.patch
+++ b/gnu/packages/patches/m4-s_isdir.patch
diff --git a/distro/packages/patches/make-impure-dirs.patch b/gnu/packages/patches/make-impure-dirs.patch
index 83a5fbe3a5..83a5fbe3a5 100644
--- a/distro/packages/patches/make-impure-dirs.patch
+++ b/gnu/packages/patches/make-impure-dirs.patch
diff --git a/distro/packages/patches/perl-no-sys-dirs.patch b/gnu/packages/patches/perl-no-sys-dirs.patch
index 3aba4d7529..3aba4d7529 100644
--- a/distro/packages/patches/perl-no-sys-dirs.patch
+++ b/gnu/packages/patches/perl-no-sys-dirs.patch
diff --git a/distro/packages/patches/procps-make-3.82.patch b/gnu/packages/patches/procps-make-3.82.patch
index 7bf53e2ccc..7bf53e2ccc 100644
--- a/distro/packages/patches/procps-make-3.82.patch
+++ b/gnu/packages/patches/procps-make-3.82.patch
diff --git a/distro/packages/patches/readline-link-ncurses.patch b/gnu/packages/patches/readline-link-ncurses.patch
index 0fd0598f46..0fd0598f46 100644
--- a/distro/packages/patches/readline-link-ncurses.patch
+++ b/gnu/packages/patches/readline-link-ncurses.patch
diff --git a/distro/packages/patches/shishi-gets-undeclared.patch b/gnu/packages/patches/shishi-gets-undeclared.patch
index a3d6d0cca2..a3d6d0cca2 100644
--- a/distro/packages/patches/shishi-gets-undeclared.patch
+++ b/gnu/packages/patches/shishi-gets-undeclared.patch
diff --git a/distro/packages/patches/tar-gets-undeclared.patch b/gnu/packages/patches/tar-gets-undeclared.patch
index 301a09dde1..301a09dde1 100644
--- a/distro/packages/patches/tar-gets-undeclared.patch
+++ b/gnu/packages/patches/tar-gets-undeclared.patch
diff --git a/distro/packages/perl.scm b/gnu/packages/perl.scm
index b6357875b6..719aa4db5c 100644
--- a/distro/packages/perl.scm
+++ b/gnu/packages/perl.scm
@@ -16,7 +16,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 (distro packages perl)
+(define-module (gnu packages perl)
   #:use-module (guix licenses)
   #:use-module (distro)
   #:use-module (guix packages)
diff --git a/distro/packages/pkg-config.scm b/gnu/packages/pkg-config.scm
index 499e3fdc86..f9bcf18728 100644
--- a/distro/packages/pkg-config.scm
+++ b/gnu/packages/pkg-config.scm
@@ -16,7 +16,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 (distro packages pkg-config)
+(define-module (gnu packages pkg-config)
   #:use-module (guix licenses)
   #:use-module (guix packages)
   #:use-module (guix download)
diff --git a/distro/packages/pth.scm b/gnu/packages/pth.scm
index 4c52079544..b0d5092cb0 100644
--- a/distro/packages/pth.scm
+++ b/gnu/packages/pth.scm
@@ -16,7 +16,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 (distro packages pth)
+(define-module (gnu packages pth)
   #:use-module (guix licenses)
   #:use-module (guix packages)
   #:use-module (guix download)
diff --git a/distro/packages/python.scm b/gnu/packages/python.scm
index 5692cd5bd5..39d4880ecc 100644
--- a/distro/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -17,11 +17,11 @@
 ;;; 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 (distro packages python)
+(define-module (gnu packages python)
   #:use-module ((guix licenses) #:select (psfl))
-  #:use-module (distro packages compression)
-  #:use-module (distro packages openssl)
-  #:use-module (distro packages base)
+  #:use-module (gnu packages compression)
+  #:use-module (gnu packages openssl)
+  #:use-module (gnu packages base)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu))
diff --git a/distro/packages/readline.scm b/gnu/packages/readline.scm
index 5498f15b52..8623e63758 100644
--- a/distro/packages/readline.scm
+++ b/gnu/packages/readline.scm
@@ -16,10 +16,10 @@
 ;;; 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 (distro packages readline)
+(define-module (gnu packages readline)
   #:use-module (guix licenses)
   #:use-module (distro)
-  #:use-module (distro packages ncurses)
+  #:use-module (gnu packages ncurses)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix utils)
diff --git a/distro/packages/recutils.scm b/gnu/packages/recutils.scm
index 484dd232bb..39452b54b9 100644
--- a/distro/packages/recutils.scm
+++ b/gnu/packages/recutils.scm
@@ -16,16 +16,16 @@
 ;;; 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 (distro packages recutils)
+(define-module (gnu packages recutils)
   #:use-module (guix licenses)
   #:use-module (distro)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix utils)
   #:use-module (guix build-system gnu)
-  #:use-module (distro packages emacs)
-  #:use-module (distro packages check)
-  #:use-module (distro packages algebra))
+  #:use-module (gnu packages emacs)
+  #:use-module (gnu packages check)
+  #:use-module (gnu packages algebra))
 
 (define-public recutils
   (package
diff --git a/distro/packages/rsync.scm b/gnu/packages/rsync.scm
index 8dc0acb118..3fb7874434 100644
--- a/distro/packages/rsync.scm
+++ b/gnu/packages/rsync.scm
@@ -16,10 +16,10 @@
 ;;; 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 (distro packages rsync)
+(define-module (gnu packages rsync)
   #:use-module (distro)
-  #:use-module (distro packages perl)
-  #:use-module (distro packages acl)
+  #:use-module (gnu packages perl)
+  #:use-module (gnu packages acl)
   #:use-module (guix licenses)
   #:use-module (guix packages)
   #:use-module (guix download)
diff --git a/distro/packages/scheme.scm b/gnu/packages/scheme.scm
index b18697cb08..a1b8f68c9d 100644
--- a/distro/packages/scheme.scm
+++ b/gnu/packages/scheme.scm
@@ -16,16 +16,16 @@
 ;;; 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 (distro packages scheme)
+(define-module (gnu packages scheme)
   #:use-module (distro)
   #:use-module (guix licenses)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
-  #:use-module (distro packages m4)
-  #:use-module (distro packages multiprecision)
-  #:use-module (distro packages emacs)
-  #:use-module (distro packages texinfo)
+  #:use-module (gnu packages m4)
+  #:use-module (gnu packages multiprecision)
+  #:use-module (gnu packages emacs)
+  #:use-module (gnu packages texinfo)
   #:use-module (ice-9 match))
 
 (define-public mit-scheme
diff --git a/distro/packages/shishi.scm b/gnu/packages/shishi.scm
index acbb1ed5c0..d6d152f368 100644
--- a/distro/packages/shishi.scm
+++ b/gnu/packages/shishi.scm
@@ -17,12 +17,12 @@
 ;;; 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 (distro packages shishi)
+(define-module (gnu packages shishi)
   #:use-module (guix licenses)
   #:use-module (distro)
-  #:use-module (distro packages gnutls)
-  #:use-module (distro packages gnupg)
-  #:use-module ((distro packages compression)
+  #:use-module (gnu packages gnutls)
+  #:use-module (gnu packages gnupg)
+  #:use-module ((gnu packages compression)
                 #:renamer (symbol-prefix-proc 'guix:))
   #:use-module (guix packages)
   #:use-module (guix download)
diff --git a/distro/packages/system.scm b/gnu/packages/system.scm
index f2a031ccd7..5fb3dc463b 100644
--- a/distro/packages/system.scm
+++ b/gnu/packages/system.scm
@@ -16,13 +16,13 @@
 ;;; 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 (distro packages system)
+(define-module (gnu packages system)
   #:use-module (guix licenses)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
   #:use-module (distro)
-  #:use-module (distro packages ncurses))
+  #:use-module (gnu packages ncurses))
 
 (define-public pies
   (package
diff --git a/distro/packages/tcl.scm b/gnu/packages/tcl.scm
index d764f6b8ad..a8c4c957c4 100644
--- a/distro/packages/tcl.scm
+++ b/gnu/packages/tcl.scm
@@ -16,7 +16,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 (distro packages tcl)
+(define-module (gnu packages tcl)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
diff --git a/distro/packages/texinfo.scm b/gnu/packages/texinfo.scm
index 99925eeb53..9a264c627c 100644
--- a/distro/packages/texinfo.scm
+++ b/gnu/packages/texinfo.scm
@@ -16,13 +16,13 @@
 ;;; 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 (distro packages texinfo)
+(define-module (gnu packages texinfo)
   #:use-module (guix licenses)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
-  #:use-module (distro packages compression)
-  #:use-module (distro packages ncurses))
+  #:use-module (gnu packages compression)
+  #:use-module (gnu packages ncurses))
 
 (define-public texinfo
   (package
diff --git a/distro/packages/time.scm b/gnu/packages/time.scm
index 0b7bde9a1b..cfb3261f94 100644
--- a/distro/packages/time.scm
+++ b/gnu/packages/time.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 (distro packages time)
+(define-module (gnu packages time)
   #:use-module (guix licenses)
   #:use-module (guix packages)
   #:use-module (guix download)
diff --git a/distro/packages/wget.scm b/gnu/packages/wget.scm
index 08b16f167b..ea31a1e70d 100644
--- a/distro/packages/wget.scm
+++ b/gnu/packages/wget.scm
@@ -16,12 +16,12 @@
 ;;; 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 (distro packages wget)
+(define-module (gnu packages wget)
   #:use-module (guix licenses)
-  #:use-module ((distro packages gettext)
+  #:use-module ((gnu packages gettext)
                 #:renamer (symbol-prefix-proc 'guix:))
-  #:use-module (distro packages gnutls)
-  #:use-module (distro packages perl)
+  #:use-module (gnu packages gnutls)
+  #:use-module (gnu packages perl)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu))
diff --git a/distro/packages/which.scm b/gnu/packages/which.scm
index 8cdd36841c..aa5330cad7 100644
--- a/distro/packages/which.scm
+++ b/gnu/packages/which.scm
@@ -16,7 +16,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 (distro packages which)
+(define-module (gnu packages which)
   #:use-module (guix licenses)
   #:use-module (guix packages)
   #:use-module (guix download)
diff --git a/distro/packages/xml.scm b/gnu/packages/xml.scm
index 5962e35d86..d67057dab2 100644
--- a/distro/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@ -16,7 +16,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 (distro packages xml)
+(define-module (gnu packages xml)
   #:use-module ((guix licenses)
                 #:renamer (symbol-prefix-proc 'license:))
   #:use-module (guix packages)
diff --git a/distro/packages/zile.scm b/gnu/packages/zile.scm
index 9eae6d4b9f..b5366c046f 100644
--- a/distro/packages/zile.scm
+++ b/gnu/packages/zile.scm
@@ -16,15 +16,15 @@
 ;;; 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 (distro packages zile)
+(define-module (gnu packages zile)
   #:use-module (guix licenses)
   #:use-module (guix download)
   #:use-module (guix packages)
   #:use-module (guix build-system gnu)
-  #:use-module (distro packages bdw-gc)
-  #:use-module (distro packages perl)
-  #:use-module (distro packages help2man)
-  #:use-module (distro packages ncurses))
+  #:use-module (gnu packages bdw-gc)
+  #:use-module (gnu packages perl)
+  #:use-module (gnu packages help2man)
+  #:use-module (gnu packages ncurses))
 
 (define-public zile
   (package
diff --git a/guix-package.in b/guix-package.in
index 217c888d2f..933b85dced 100644
--- a/guix-package.in
+++ b/guix-package.in
@@ -48,8 +48,8 @@ exec ${GUILE-@GUILE@} -L "@guilemoduledir@" -l "$0"    \
   #:use-module (srfi srfi-34)
   #:use-module (srfi srfi-37)
   #:use-module (distro)
-  #:use-module ((distro packages base) #:select (guile-final))
-  #:use-module ((distro packages bootstrap) #:select (%bootstrap-guile))
+  #:use-module ((gnu packages base) #:select (guile-final))
+  #:use-module ((gnu packages bootstrap) #:select (%bootstrap-guile))
   #:export (guix-package))
 
 (define %store
diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm
index 3eaed4bd78..4f84b3ccee 100644
--- a/guix/build-system/gnu.scm
+++ b/guix/build-system/gnu.scm
@@ -159,8 +159,8 @@ System: GCC, GNU Make, Bash, Coreutils, etc."
            (z
             (error "invalid standard input" z)))
 
-          ;; Resolve (distro packages base) lazily to hide circular dependency.
-          (let* ((distro (resolve-module '(distro packages base)))
+          ;; Resolve (gnu packages base) lazily to hide circular dependency.
+          (let* ((distro (resolve-module '(gnu packages base)))
                  (inputs (module-ref distro '%final-inputs)))
             (append inputs
                     (append-map (match-lambda
@@ -233,7 +233,7 @@ which could lead to gratuitous input divergence."
       ((and (? string?) (? derivation-path?))
        guile)
       (#f                                         ; the default
-       (let* ((distro (resolve-interface '(distro packages base)))
+       (let* ((distro (resolve-interface '(gnu packages base)))
               (guile  (module-ref distro 'guile-final)))
          (package-derivation store guile system)))))
 
diff --git a/guix/build-system/trivial.scm b/guix/build-system/trivial.scm
index 866657fdf6..e5bbeaa91d 100644
--- a/guix/build-system/trivial.scm
+++ b/guix/build-system/trivial.scm
@@ -36,7 +36,7 @@ ignored."
       ((and (? string?) (? derivation-path?))
        guile)
       (#f                                         ; the default
-       (let* ((distro (resolve-interface '(distro packages base)))
+       (let* ((distro (resolve-interface '(gnu packages base)))
               (guile  (module-ref distro 'guile-final)))
          (package-derivation store guile system)))))
 
diff --git a/guix/download.scm b/guix/download.scm
index 3372567b47..cf68ade74b 100644
--- a/guix/download.scm
+++ b/guix/download.scm
@@ -118,7 +118,7 @@ must be a list of symbol/URL-list pairs."
       ((and (? string?) (? derivation-path?))
        guile)
       (#f                                         ; the default
-       (let* ((distro (resolve-interface '(distro packages base)))
+       (let* ((distro (resolve-interface '(gnu packages base)))
               (guile  (module-ref distro 'guile-final)))
          (package-derivation store guile system)))))
 
diff --git a/hydra.scm b/hydra.scm
index e350f286af..fdca935d5f 100644
--- a/hydra.scm
+++ b/hydra.scm
@@ -25,8 +25,8 @@
              (guix packages)
              ((guix utils) #:select (%current-system))
              (distro)
-             (distro packages base)
-             (distro packages guile)
+             (gnu packages base)
+             (gnu packages guile)
              (srfi srfi-1)
              (srfi srfi-26)
              (ice-9 match))
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 2ca98ed1b5..d8fb384ae5 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,9 +1,9 @@
 # List of source files which contain translatable strings.
 distro.scm
-distro/packages/base.scm
-distro/packages/guile.scm
-distro/packages/lout.scm
-distro/packages/recutils.scm
+gnu/packages/base.scm
+gnu/packages/guile.scm
+gnu/packages/lout.scm
+gnu/packages/recutils.scm
 guix/ui.scm
 guix-build.in
 guix-download.in
diff --git a/tests/builders.scm b/tests/builders.scm
index a1e3f8088a..7fafaf5dca 100644
--- a/tests/builders.scm
+++ b/tests/builders.scm
@@ -26,7 +26,7 @@
   #:use-module (guix base32)
   #:use-module (guix derivations)
   #:use-module ((guix packages) #:select (package-derivation))
-  #:use-module (distro packages bootstrap)
+  #:use-module (gnu packages bootstrap)
   #:use-module (ice-9 match)
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-64))
@@ -48,7 +48,7 @@
        (map (match-lambda
              ((name package)
               (list name (package-derivation %store package))))
-            (@@ (distro packages base) %boot0-inputs))))
+            (@@ (gnu packages base) %boot0-inputs))))
 
 (define network-reachable?
   (false-if-exception (getaddrinfo "www.gnu.org" "80" AI_NUMERICSERV)))
diff --git a/tests/derivations.scm b/tests/derivations.scm
index 166a917490..21c2a6acd9 100644
--- a/tests/derivations.scm
+++ b/tests/derivations.scm
@@ -24,7 +24,7 @@
   #:use-module (guix base32)
   #:use-module ((guix packages) #:select (package-derivation))
   #:use-module ((distro) #:select (search-bootstrap-binary))
-  #:use-module (distro packages bootstrap)
+  #:use-module (gnu packages bootstrap)
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-11)
   #:use-module (srfi srfi-26)
diff --git a/tests/guix-build.sh b/tests/guix-build.sh
index f03afbd494..fccf2168b1 100644
--- a/tests/guix-build.sh
+++ b/tests/guix-build.sh
@@ -27,11 +27,11 @@ if guix-build -e +;
 then false; else true; fi
 
 # Should fail because this is a source-less package.
-if guix-build -e '(@ (distro packages bootstrap) %bootstrap-glibc)' -S
+if guix-build -e '(@ (gnu packages bootstrap) %bootstrap-glibc)' -S
 then false; else true; fi
 
 # Should pass.
-guix-build -e '(@@ (distro packages base) %bootstrap-guile)' |	\
+guix-build -e '(@@ (gnu packages base) %bootstrap-guile)' |	\
     grep -e '-guile-'
 guix-build hello -d |				\
     grep -e '-hello-[0-9\.]\+\.drv$'
@@ -42,11 +42,11 @@ if guix-build hello-0.0.1 -n; then false; else true; fi
 # Keep a symlink to the result, registered as a root.
 result="t-result-$$"
 guix-build -r "$result"					\
-    -e '(@@ (distro packages base) %bootstrap-guile)'
+    -e '(@@ (gnu packages base) %bootstrap-guile)'
 test -x "$result/bin/guile"
 
 # Should fail, because $result already exists.
-if guix-build -r "$result" -e '(@@ (distro packages base) %bootstrap-guile)'
+if guix-build -r "$result" -e '(@@ (gnu packages base) %bootstrap-guile)'
 then false; else true; fi
 
 rm -f "$result"
diff --git a/tests/guix-daemon.sh b/tests/guix-daemon.sh
index ba652b3dce..0d39ff4c24 100644
--- a/tests/guix-daemon.sh
+++ b/tests/guix-daemon.sh
@@ -25,5 +25,5 @@ set -e
 guix-daemon --version
 guix-build --version
 
-guix-build -e '(@ (distro packages bootstrap) %bootstrap-guile)'
+guix-build -e '(@ (gnu packages bootstrap) %bootstrap-guile)'
 guix-build coreutils -n
diff --git a/tests/guix-package.sh b/tests/guix-package.sh
index fc80939646..7b7835dcaa 100644
--- a/tests/guix-package.sh
+++ b/tests/guix-package.sh
@@ -32,7 +32,7 @@ rm -f "$profile"
 
 trap 'rm "$profile" "$profile-"[0-9]* ; rm -rf t-home-'"$$" EXIT
 
-boot_guile="`guix-build -e '(@ (distro packages bootstrap) %bootstrap-guile)'`"
+boot_guile="`guix-build -e '(@ (gnu packages bootstrap) %bootstrap-guile)'`"
 
 guix-package --bootstrap -p "$profile" -i "$boot_guile"
 test -L "$profile" && test -L "$profile-1-link"
@@ -47,7 +47,7 @@ test -f "$profile/bin/guile"
 # Check whether we have network access.
 if guile -c '(getaddrinfo "www.gnu.org" "80" AI_NUMERICSERV)' 2> /dev/null
 then
-    boot_make="`guix-build -e '(@@ (distro packages base) gnu-make-boot0)'`"
+    boot_make="`guix-build -e '(@@ (gnu packages base) gnu-make-boot0)'`"
     guix-package --bootstrap -p "$profile" -i "$boot_make"
     test -L "$profile-2-link"
     test -f "$profile/bin/make" && test -f "$profile/bin/guile"
diff --git a/tests/packages.scm b/tests/packages.scm
index f15f404db6..07d2ea54c7 100644
--- a/tests/packages.scm
+++ b/tests/packages.scm
@@ -25,8 +25,8 @@
   #:use-module (guix build-system trivial)
   #:use-module (guix build-system gnu)
   #:use-module (distro)
-  #:use-module (distro packages base)
-  #:use-module (distro packages bootstrap)
+  #:use-module (gnu packages base)
+  #:use-module (gnu packages bootstrap)
   #:use-module (srfi srfi-26)
   #:use-module (srfi srfi-64)
   #:use-module (rnrs io ports)
@@ -130,7 +130,7 @@
 (test-assert "GNU Make, bootstrap"
   ;; GNU Make is the first program built during bootstrap; we choose it
   ;; here so that the test doesn't last for too long.
-  (let ((gnu-make (@@ (distro packages base) gnu-make-boot0)))
+  (let ((gnu-make (@@ (gnu packages base) gnu-make-boot0)))
     (and (package? gnu-make)
          (or (location? (package-location gnu-make))
              (not (package-location gnu-make)))
diff --git a/tests/store.scm b/tests/store.scm
index 3b3a23489d..c10c035d5d 100644
--- a/tests/store.scm
+++ b/tests/store.scm
@@ -21,7 +21,7 @@
   #:use-module (guix store)
   #:use-module (guix utils)
   #:use-module (guix base32)
-  #:use-module (distro packages bootstrap)
+  #:use-module (gnu packages bootstrap)
   #:use-module (ice-9 match)
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-11)
diff --git a/tests/union.scm b/tests/union.scm
index 5bbf992a59..455bdb208d 100644
--- a/tests/union.scm
+++ b/tests/union.scm
@@ -25,7 +25,7 @@
   #:use-module (guix build union)
   #:use-module ((guix build utils)
                 #:select (with-directory-excursion directory-exists?))
-  #:use-module (distro packages bootstrap)
+  #:use-module (gnu packages bootstrap)
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-64)
   #:use-module (ice-9 match))