diff --git a/gnu/packages/abiword.scm b/gnu/packages/abiword.scm
index 82a289e7125ae913f4bbe9330da24104e14ed70b..a76b16c5af40cce4b897e7caaf2d4d3a5cdfc6ae 100644
--- a/gnu/packages/abiword.scm
+++ b/gnu/packages/abiword.scm
@@ -17,8 +17,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages abiword)
-  #:use-module ((guix licenses)
-                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index ffeab07bde6b36bd994b81771cd53e2eb5487eab..f6ff32c8a26bb253831a8bf860f8450daf4c4b1b 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -36,10 +36,8 @@ (define-module (gnu packages admin)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages tcl)
-  #:use-module ((gnu packages compression)
-                #:renamer (symbol-prefix-proc 'c:))
-  #:use-module ((gnu packages openssl)
-                #:renamer (symbol-prefix-proc 'o:))
+  #:use-module ((gnu packages compression) #:prefix c:)
+  #:use-module ((gnu packages openssl) #:prefix o:)
   #:use-module (gnu packages bison)
   #:use-module (gnu packages flex)
   #:use-module (gnu packages glib)
diff --git a/gnu/packages/aidc.scm b/gnu/packages/aidc.scm
index 393d2c6fb409718529eaf687a98e96074cd11b1f..d5428d30aa83e692d4980dd5ea32456290e7bf37 100644
--- a/gnu/packages/aidc.scm
+++ b/gnu/packages/aidc.scm
@@ -18,8 +18,7 @@
 
 (define-module (gnu packages aidc)
   #:use-module (gnu packages)
-  #:use-module ((guix licenses)
-                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (gnu packages pkg-config)
diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm
index d6e106071f9ea6b356161149d29b334be7de2231..6fd7306d6cec3986e679c7f0cc7d3a06aa3685b6 100644
--- a/gnu/packages/backup.scm
+++ b/gnu/packages/backup.scm
@@ -18,8 +18,7 @@
 
 (define-module (gnu packages backup)
   #:use-module (guix packages)
-  #:use-module ((guix licenses)
-                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix download)
   #:use-module (guix build utils)
   #:use-module (guix build-system gnu)
diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm
index 496120a06d87d83c37273dea335f3919fec6f65c..8b4388668ebc2c75bb12dbde2b8f4f529b7cf9c2 100644
--- a/gnu/packages/bittorrent.scm
+++ b/gnu/packages/bittorrent.scm
@@ -20,8 +20,7 @@ (define-module (gnu packages bittorrent)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
-  #:use-module ((guix licenses)
-                #:renamer (symbol-prefix-proc 'l:))
+  #:use-module ((guix licenses) #:prefix l:)
   #:use-module (gnu packages openssl)
   #:use-module (gnu packages libevent)
   #:use-module (gnu packages curl)
diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm
index a77f1393d9ee136e46f310352a98558ad5454fa5..f0feeb73c0fe2409e1e581d4952748bf0b700f4e 100644
--- a/gnu/packages/boost.scm
+++ b/gnu/packages/boost.scm
@@ -18,8 +18,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages boost)
-  #:use-module ((guix licenses)
-                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index dbaed6155dae8682f394bf03972e9b296dfd673c..217ddef1c0c9c4fb7237eb58021bb65a7cd4d0cd 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -19,8 +19,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages compression)
-  #:use-module ((guix licenses)
-                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
diff --git a/gnu/packages/cryptsetup.scm b/gnu/packages/cryptsetup.scm
index 781147cc3505568f29e83039a6f4bea37d75ac46..efb7e1f2daf42383146f432f42a3594d6f30220a 100644
--- a/gnu/packages/cryptsetup.scm
+++ b/gnu/packages/cryptsetup.scm
@@ -17,8 +17,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages cryptsetup)
-  #:use-module ((guix licenses)
-                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm
index 727c57d6113754c63d51744a148f2fef74691131..f77c5401d4b7d63729b832f69f35707dc07bdf0d 100644
--- a/gnu/packages/curl.scm
+++ b/gnu/packages/curl.scm
@@ -17,8 +17,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages curl)
-  #:use-module ((guix licenses)
-                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
diff --git a/gnu/packages/cyrus-sasl.scm b/gnu/packages/cyrus-sasl.scm
index 0c92cc36a17d46d4b1987ea04eca7d579168ebbe..9f709888142823000f034066b10cd2059cd12781 100644
--- a/gnu/packages/cyrus-sasl.scm
+++ b/gnu/packages/cyrus-sasl.scm
@@ -22,8 +22,7 @@ (define-module (gnu packages cyrus-sasl)
   #: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 licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu))
diff --git a/gnu/packages/dc.scm b/gnu/packages/dc.scm
index 0e65d886d0f6340c8562906b7c7185f88eaafddf..4692244de691dae907f79c4bf5667679826440c9 100644
--- a/gnu/packages/dc.scm
+++ b/gnu/packages/dc.scm
@@ -27,8 +27,7 @@ (define-module (gnu packages dc)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
-  #:use-module ((guix licenses)
-  #:renamer (symbol-prefix-proc 'license:)))
+  #:use-module ((guix licenses) #:prefix license:))
 
 (define-public ncdc
   (package
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index a788bd8fde94e17a921a7125240191b7441234ca..6e42d0ac670bd275de1060af2eb0121b30c95ee2 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -41,8 +41,7 @@ (define-module (gnu packages emacs)
   #:use-module (gnu packages w3m)
   #:use-module (gnu packages wget)
   #:use-module (gnu packages autotools)
-  #:use-module ((gnu packages compression)
-                #:renamer (symbol-prefix-proc 'compression:))
+  #:use-module ((gnu packages compression) #:prefix compression:)
   #:use-module (gnu packages xml)
   #:use-module (gnu packages glib)
   #:use-module (guix utils)
diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index 7802d364dda8638adec04763144f61a6f1967edc..7c95666c531aa2e4c6f67821dee01c37a6c61664 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -19,8 +19,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages fonts)
-  #:use-module ((guix licenses)
-                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm
index a67b0a223036e6e7c1b0e4a7e9d69cd51e6b4f61..3b835760cebe78e9fc74bf0f6f5ffdae963c6d50 100644
--- a/gnu/packages/fontutils.scm
+++ b/gnu/packages/fontutils.scm
@@ -22,7 +22,7 @@ (define-module (gnu packages fontutils)
   #:use-module (gnu packages ghostscript)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages xml)
-  #:use-module ((guix licenses) #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu))
diff --git a/gnu/packages/geeqie.scm b/gnu/packages/geeqie.scm
index 7d8bb6755624e3da40e9100efa94946f0ed2869a..3bc25ce790f2930f40a1e9d4280b783fa2b32a84 100644
--- a/gnu/packages/geeqie.scm
+++ b/gnu/packages/geeqie.scm
@@ -19,8 +19,7 @@
 (define-module (gnu packages geeqie)
   #:use-module (guix packages)
   #:use-module (guix download)
-  #:use-module ((guix licenses)
-                #:renamer (symbol-prefix-proc 'l:))
+  #:use-module ((guix licenses) #:prefix l:)
   #:use-module (guix build-system gnu)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages glib)
diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm
index 13997cd4e6fec7946739bbbf561160d0ab38699f..1d12075fcc378693cc5777426cff9c501e1c213b 100644
--- a/gnu/packages/ghostscript.scm
+++ b/gnu/packages/ghostscript.scm
@@ -25,7 +25,7 @@ (define-module (gnu packages ghostscript)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
   #:use-module (gnu packages tcl)
-  #:use-module ((guix licenses) #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu))
diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm
index 399c99bcdf238b06079a233d02a9aade9a9692f2..8fe4f767ed5d4cd204f5159b3848e6f3e5826225 100644
--- a/gnu/packages/gimp.scm
+++ b/gnu/packages/gimp.scm
@@ -19,8 +19,7 @@
 (define-module (gnu packages gimp)
   #:use-module (guix packages)
   #:use-module (guix download)
-  #:use-module ((guix licenses)
-                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix build-system gnu)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages glib)
diff --git a/gnu/packages/gkrellm.scm b/gnu/packages/gkrellm.scm
index 610af418b4dc91e2fcf4186e8e22957d267a60bb..31bca00889d2f8b331b478e58ae2ded8baee432b 100644
--- a/gnu/packages/gkrellm.scm
+++ b/gnu/packages/gkrellm.scm
@@ -17,8 +17,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages gkrellm)
-  #:use-module ((guix licenses)
-                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index 6f92cac55ea3c297b685f79624d71e07d81bc20b..a65639bee3c251154afafabf3e1590ffac26be9d 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -19,8 +19,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages gl)
-  #:use-module ((guix licenses)
-                #:renamer (symbol-prefix-proc 'l:))
+  #:use-module ((guix licenses) #:prefix l:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 239715ecc762ffd37cfc6dd6349ebabf60f70466..2712ef0c8b4fd5467f73971e072eb168f368ccbd 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -19,8 +19,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages glib)
-  #:use-module ((guix licenses)
-                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index cf690da25ab54fc066b4706fc7e1fbc0f19c2987..bbb30532840d3aa599b246d19865f9834a9e3a0b 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -18,8 +18,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages gnome)
-  #:use-module ((guix licenses)
-                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm
index d5a1930bbe336356d1207f67a4c2ef22c57892c1..927d201d49e462a3896563641464a7ba2f5371c0 100644
--- a/gnu/packages/gnunet.scm
+++ b/gnu/packages/gnunet.scm
@@ -41,8 +41,7 @@ (define-module (gnu packages gnunet)
   #:use-module (gnu packages databases)
   #:use-module (gnu packages video)
   #:use-module (gnu packages xiph)
-  #:use-module ((guix licenses)
-                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu))
diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index 326a321ca59cd13162939f1ba41cf446393922d0..f3f5d97b4b2ce19497378ea6315b6d14fe4fdef5 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -27,8 +27,7 @@ (define-module (gnu packages gnupg)
   #:use-module (gnu packages pth)
   #:use-module (gnu packages python)
   #:use-module (gnu packages readline)
-  #:use-module ((gnu packages compression)
-                #:renamer (symbol-prefix-proc 'guix:))
+  #:use-module ((gnu packages compression) #:prefix guix:)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages pkg-config)
diff --git a/gnu/packages/gnutls.scm b/gnu/packages/gnutls.scm
index 89fc86d6ade21e557ef6ab0b054428b3d0311ab7..611c506acc61e8e1e4a99ef177b7a74155cfb6cf 100644
--- a/gnu/packages/gnutls.scm
+++ b/gnu/packages/gnutls.scm
@@ -22,8 +22,7 @@ (define-module (gnu packages gnutls)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
-  #:use-module ((gnu packages compression)
-                #:renamer (symbol-prefix-proc 'guix:))
+  #:use-module ((gnu packages compression) #:prefix guix:)
   #:use-module (gnu packages)
   #:use-module (gnu packages nettle)
   #:use-module (gnu packages guile)
diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index 311ebbee8bb20e324ae0012b5e7651fe947dc45a..11515d4243f3a806de796ccaafec91e2152c3439 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -19,8 +19,7 @@
 
 (define-module (gnu packages gnuzilla)
   #:use-module (gnu packages)
-  #:use-module ((guix licenses)
-                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
diff --git a/gnu/packages/gsasl.scm b/gnu/packages/gsasl.scm
index 11f856f3cde529b954b686331ea9f670ba944c25..8739c0444e39ed9d2d76052e90b0b30644d0ff65 100644
--- a/gnu/packages/gsasl.scm
+++ b/gnu/packages/gsasl.scm
@@ -18,8 +18,7 @@
 
 (define-module (gnu packages gsasl)
   #:use-module (gnu packages)
-  #:use-module ((gnu packages compression)
-                #:renamer (symbol-prefix-proc 'guix:))
+  #:use-module ((gnu packages compression) #:prefix guix:)
   #:use-module (gnu packages gnutls)
   #:use-module (gnu packages libidn)
   #:use-module (gnu packages nettle)
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 5a72d6736e97108f54056cec03c008c8cf37339a..4dd389ba4782b5c13bb2a0a78ee1adc773fb6235 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -19,8 +19,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages gtk)
-  #:use-module ((guix licenses)
-                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
diff --git a/gnu/packages/gv.scm b/gnu/packages/gv.scm
index a67137f0c2c567732afc28b11dca2ac271b8033f..f6359421194e5a2bbe7a44e54f188e48814d12a2 100644
--- a/gnu/packages/gv.scm
+++ b/gnu/packages/gv.scm
@@ -23,7 +23,7 @@ (define-module (gnu packages gv)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages xorg)
-  #:use-module ((guix licenses) #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu))
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index a55a5456afcb3ce041cd1a8bad04b61968d9c15a..981d3a8976463f9b0c3428099e687501ddcbb48d 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -23,7 +23,7 @@ (define-module (gnu packages image)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages xml)
   #:use-module (gnu packages ghostscript)         ;lcms
-  #:use-module ((guix licenses) #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
diff --git a/gnu/packages/indent.scm b/gnu/packages/indent.scm
index 7d7acba2dc4e221ee052c4b533726df6dfc2f51d..bd36f7bb44e6cb7545229c7392500a3d3b872de6 100644
--- a/gnu/packages/indent.scm
+++ b/gnu/packages/indent.scm
@@ -19,8 +19,7 @@
 
 (define-module (gnu packages indent)
   #:use-module (gnu packages)
-  #:use-module ((guix licenses)
-                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu))
diff --git a/gnu/packages/inkscape.scm b/gnu/packages/inkscape.scm
index 9c3c9c2f74e0eb95124fbcfd12afb7fa561ec419..b48bedc78d9044fa6066c0d3b58484c76db3fab1 100644
--- a/gnu/packages/inkscape.scm
+++ b/gnu/packages/inkscape.scm
@@ -17,8 +17,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages inkscape)
-  #:use-module ((guix licenses)
-                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
diff --git a/gnu/packages/lesstif.scm b/gnu/packages/lesstif.scm
index d15549454f9fb69be403cd5dcfc355d084dac468..d2ad120531955cc71edcbceac4edf446768334a1 100644
--- a/gnu/packages/lesstif.scm
+++ b/gnu/packages/lesstif.scm
@@ -17,8 +17,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages lesstif)
-  #:use-module ((guix licenses)
-                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
diff --git a/gnu/packages/links.scm b/gnu/packages/links.scm
index c18f7de1bd2a6d429be021614dc1d51f47ef9af8..9b9eee5b6947660c79729e6bf802d59a721ae597 100644
--- a/gnu/packages/links.scm
+++ b/gnu/packages/links.scm
@@ -17,8 +17,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages links)
-  #:use-module ((guix licenses) 
-                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (gnu packages)
   #:use-module (gnu packages compression)
diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index c2edaaf0b2da69f76601b0b1e6e5da5e4eab14c8..1519ae1422bc731d06812e9d13b09fd29a1d401b 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -18,8 +18,7 @@
 
 (define-module (gnu packages lisp)
   #:use-module (gnu packages)
-  #:use-module ((guix licenses)
-                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (gnu packages readline)
   #:use-module (gnu packages texinfo)
diff --git a/gnu/packages/lsh.scm b/gnu/packages/lsh.scm
index 52d9df438686d4a54cf05a49568f616c31906504..1b4dfd051bc0318638dc5bf96ea060f8241b8fc4 100644
--- a/gnu/packages/lsh.scm
+++ b/gnu/packages/lsh.scm
@@ -25,8 +25,7 @@ (define-module (gnu packages lsh)
   #:use-module (gnu packages m4)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages nettle)
-  #:use-module ((gnu packages compression)
-                #:renamer (symbol-prefix-proc 'guix:))
+  #:use-module ((gnu packages compression) #:prefix guix:)
   #:use-module (gnu packages multiprecision)
   #:use-module (gnu packages readline)
   #:use-module (gnu packages gperf)
diff --git a/gnu/packages/lsof.scm b/gnu/packages/lsof.scm
index fc5ddc9cda8863c8425f87f6871425df42b6770a..3611a456a0e41336434644a5954e3d8d78dc679c 100644
--- a/gnu/packages/lsof.scm
+++ b/gnu/packages/lsof.scm
@@ -17,8 +17,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages lsof)
-  #:use-module ((guix licenses)
-                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index af9feff0402fb683670c6b7add9dca835abce1f5..9d721f86e4e44f41b2c198f91e9ea388a0cbf52d 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -21,8 +21,7 @@
 
 (define-module (gnu packages maths)
   #:use-module (gnu packages)
-  #:use-module ((guix licenses)
-                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix utils)
diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm
index 79ae6eac9456fc1b768f57339403797798021344..386060162346ff1fc9517a390cf6452960cb3bc0 100644
--- a/gnu/packages/mp3.scm
+++ b/gnu/packages/mp3.scm
@@ -17,8 +17,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages mp3)
-  #:use-module ((guix licenses)
-                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (gnu packages)
   #:use-module (gnu packages autotools)
   #:use-module (gnu packages cdrom)
diff --git a/gnu/packages/openssl.scm b/gnu/packages/openssl.scm
index 77e286082630a880252b7759867368656ab10e06..a94b7a5c3bab9583d6745c8fed96a8f540ef7647 100644
--- a/gnu/packages/openssl.scm
+++ b/gnu/packages/openssl.scm
@@ -20,7 +20,7 @@
 (define-module (gnu packages openssl)
   #:use-module (gnu packages)
   #:use-module (gnu packages perl)
-  #:use-module ((guix licenses) #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu))
diff --git a/gnu/packages/ots.scm b/gnu/packages/ots.scm
index 440484137562546740ac410fab46ed2f0808a44a..e31724535529987bdc422985b954a2634c83444b 100644
--- a/gnu/packages/ots.scm
+++ b/gnu/packages/ots.scm
@@ -26,8 +26,7 @@ (define-module (gnu packages ots)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
-  #:use-module ((guix licenses)
-                #:renamer (symbol-prefix-proc 'license:)))
+  #:use-module ((guix licenses) #:prefix license:))
 
 (define-public ots
   (package
diff --git a/gnu/packages/pciutils.scm b/gnu/packages/pciutils.scm
index 2b887f16d8c0a170e1e3145f3386a672f473e99a..bf395e33e86828ded9470d61a7b91457ace102e7 100644
--- a/gnu/packages/pciutils.scm
+++ b/gnu/packages/pciutils.scm
@@ -19,8 +19,7 @@
 (define-module (gnu packages pciutils)
   #:use-module (guix packages)
   #:use-module (guix download)
-  #:use-module ((guix licenses)
-                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix build-system gnu)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages pkg-config)
diff --git a/gnu/packages/pcre.scm b/gnu/packages/pcre.scm
index b3f89427e71109a8b2b5b75bf71e16fdbb6359ea..94df45499b6dcd6302cc64bfb6452958b4a254d4 100644
--- a/gnu/packages/pcre.scm
+++ b/gnu/packages/pcre.scm
@@ -17,8 +17,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages pcre)
-  #:use-module ((guix licenses)
-                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages readline)
   #:use-module (guix packages)
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index c3cb755f4d0f212e5762b4374321bd8649984afe..d6d97c1ea8e877887dcea37fa941303a518b02fe 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -17,8 +17,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages pdf)
-  #:use-module ((guix licenses)
-                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm
index b17ee6987fba5c505b858bd4ab2dd47f812dc533..63f343dc37c7370c5d69cf3195b05882af637e60 100644
--- a/gnu/packages/pulseaudio.scm
+++ b/gnu/packages/pulseaudio.scm
@@ -20,8 +20,7 @@
 (define-module (gnu packages pulseaudio)
   #:use-module (guix packages)
   #:use-module (guix download)
-  #:use-module ((guix licenses)
-                #:renamer (symbol-prefix-proc 'l:))
+  #:use-module ((guix licenses) #:prefix l:)
   #:use-module (guix build-system gnu)
   #:use-module (gnu packages)
   #:use-module (gnu packages algebra)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 5195f663949444a5d645e89a2c0f145c14b6ae68..897e2480469b57c5638c454f71ea4a6b725ab89c 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -25,8 +25,7 @@ (define-module (gnu packages python)
                 #:select (asl2.0 bsd-3 bsd-2 bsd-style cc0 expat x11 x11-style
                           gpl2 gpl2+ gpl3+ lgpl2.0+ lgpl2.1+
                           psfl public-domain))
-  #:use-module ((guix licenses) #:select (zlib)
-                                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:select (zlib) #:prefix license:)
   #:use-module (gnu packages)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages gdbm)
diff --git a/gnu/packages/slim.scm b/gnu/packages/slim.scm
index b179acfc56246390c713e8128708cd3a64f8fa8c..70aab8cc96a69bf463d3ffac86891244b309b543 100644
--- a/gnu/packages/slim.scm
+++ b/gnu/packages/slim.scm
@@ -19,8 +19,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages slim)
-  #:use-module ((guix licenses)
-		#:renamer (symbol-prefix-proc 'l:))
+  #:use-module ((guix licenses) #:prefix l:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system cmake)
diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm
index a22468affd35643679cb97dfb3341a0dd2ccf1ff..7d7e2fd1c1a9a4b534da80f70497a335df1a5f5e 100644
--- a/gnu/packages/ssh.scm
+++ b/gnu/packages/ssh.scm
@@ -18,8 +18,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages ssh)
-  #:use-module ((guix licenses)
-                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages groff)
diff --git a/gnu/packages/texlive.scm b/gnu/packages/texlive.scm
index 57a250cba2474a0ed907330ce230a157037fa9a3..e562b02598f873618cc139fbe9bbeac7ae4cbce8 100644
--- a/gnu/packages/texlive.scm
+++ b/gnu/packages/texlive.scm
@@ -18,8 +18,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages texlive)
-  #:use-module ((guix licenses)
-                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm
index 4a46a1cd7d807b49dd91521253d7df4e30653ec4..66e0f0ed268c942174bb217192b8515ed3d9e65d 100644
--- a/gnu/packages/vim.scm
+++ b/gnu/packages/vim.scm
@@ -17,7 +17,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages vim)
-  #:use-module ((guix licenses) #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm
index f1db433ba93df8f35bee2d97a23a850b4565d63a..480d97712b00489ce9ece4108c256f2b74ed8906 100644
--- a/gnu/packages/vpn.scm
+++ b/gnu/packages/vpn.scm
@@ -19,8 +19,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages vpn)
-  #:use-module ((guix licenses)
-                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 2283d4a50b37fa27b882d123d7627c8ae1235f4b..57eb89adfc07a1b811bdcbc64444c963b36d010f 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -19,8 +19,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages web)
-  #:use-module ((guix licenses)
-                #:renamer (symbol-prefix-proc 'l:))
+  #:use-module ((guix licenses) #:prefix l:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix git-download)
diff --git a/gnu/packages/wv.scm b/gnu/packages/wv.scm
index af8412cbc42168a7222ed81d50d7cd1585221f4e..a7f294462b8be8eeb8adab3cf4773342cb78eb1f 100644
--- a/gnu/packages/wv.scm
+++ b/gnu/packages/wv.scm
@@ -26,7 +26,7 @@ (define-module (gnu packages wv)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
-  #:use-module ((guix licenses) #:renamer (symbol-prefix-proc 'license:)))
+  #:use-module ((guix licenses) #:prefix license:))
 
 (define-public wv
   (package
diff --git a/gnu/packages/xiph.scm b/gnu/packages/xiph.scm
index 8259be3f7d9c18f0cffeb9f3f8a42f0b4b7352e0..4ddda7051a03780a75df8d926c6d44d7335d7cf1 100644
--- a/gnu/packages/xiph.scm
+++ b/gnu/packages/xiph.scm
@@ -31,8 +31,7 @@ (define-module (gnu packages xiph)
   #:use-module (gnu packages python)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages pulseaudio)
-  #:use-module ((guix licenses)
-                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm
index d070a8d4dbf4011739089307683c74a5956aa328..688aa3b07b9cfd110c5b18c99d7d377f198448cb 100644
--- a/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@ -24,8 +24,7 @@ (define-module (gnu packages xml)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages python)
   #:use-module (gnu packages web)
-  #:use-module ((guix licenses)
-                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 9b5526d3e205eadb10278bc85e4f48bd4d0851bb..7f12d3a68756b70190c59ca705c81d6ed32c5fa7 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -19,8 +19,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages xorg)
-  #:use-module ((guix licenses)
-                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
diff --git a/gnu/packages/yasm.scm b/gnu/packages/yasm.scm
index a990d081740b840d1d3c60ba215b91f96abdae32..8314e222476fb3f70ebc67e5ac5c574a4268297e 100644
--- a/gnu/packages/yasm.scm
+++ b/gnu/packages/yasm.scm
@@ -18,8 +18,7 @@
 
 (define-module (gnu packages yasm)
   #:use-module (gnu packages)
-  #:use-module ((guix licenses)
-                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
diff --git a/gnu/packages/zip.scm b/gnu/packages/zip.scm
index 1e1d29e1b751e74d8e007302dee27e6c9214fe92..13dc62c212b577aba3bf77cb3c719fcff841f422 100644
--- a/gnu/packages/zip.scm
+++ b/gnu/packages/zip.scm
@@ -18,8 +18,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages zip)
-  #:use-module ((guix licenses)
-                #:renamer (symbol-prefix-proc 'license:))
+  #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
diff --git a/guix/build/cmake-build-system.scm b/guix/build/cmake-build-system.scm
index 144552e8ded454a090276e06a3d706c5630efc65..7d60ab7aa915c1c657f5e307acf1c8a3c75c09a9 100644
--- a/guix/build/cmake-build-system.scm
+++ b/guix/build/cmake-build-system.scm
@@ -19,8 +19,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (guix build cmake-build-system)
-  #:use-module ((guix build gnu-build-system)
-                #:renamer (symbol-prefix-proc 'gnu:))
+  #:use-module ((guix build gnu-build-system) #:prefix gnu:)
   #:use-module (guix build utils)
   #:use-module (ice-9 match)
   #:export (%standard-phases
diff --git a/guix/build/perl-build-system.scm b/guix/build/perl-build-system.scm
index 793b6aacb5fb85286ea5dc0f615cb5bd328261f2..904daf7ac28c185b9e46f7413c6d60a930f489d5 100644
--- a/guix/build/perl-build-system.scm
+++ b/guix/build/perl-build-system.scm
@@ -17,8 +17,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (guix build perl-build-system)
-  #:use-module ((guix build gnu-build-system)
-                #:renamer (symbol-prefix-proc 'gnu:))
+  #:use-module ((guix build gnu-build-system) #:prefix gnu:)
   #:use-module (guix build utils)
   #:use-module (ice-9 match)
   #:export (%standard-phases
diff --git a/guix/build/python-build-system.scm b/guix/build/python-build-system.scm
index 0bb8c4d49d762dfbffea77dabf939fa5a570c983..2f3d04a5d8f133daea16c0c5a5a63885b186b79f 100644
--- a/guix/build/python-build-system.scm
+++ b/guix/build/python-build-system.scm
@@ -19,8 +19,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (guix build python-build-system)
-  #:use-module ((guix build gnu-build-system)
-                #:renamer (symbol-prefix-proc 'gnu:))
+  #:use-module ((guix build gnu-build-system) #:prefix gnu:)
   #:use-module (guix build utils)
   #:use-module (ice-9 match)
   #:use-module (ice-9 ftw)
diff --git a/guix/download.scm b/guix/download.scm
index c0a7e8c23aec0900888b115ad9aebe11d1c60a4b..e956e084701119c9969dc3aad995f6832241678a 100644
--- a/guix/download.scm
+++ b/guix/download.scm
@@ -22,7 +22,7 @@ (define-module (guix download)
   #:use-module (guix derivations)
   #:use-module (guix packages)
   #:use-module ((guix store) #:select (derivation-path? add-to-store))
-  #:use-module ((guix build download) #:renamer (symbol-prefix-proc 'build:))
+  #:use-module ((guix build download) #:prefix build:)
   #:use-module (guix monads)
   #:use-module (guix gexp)
   #:use-module (guix utils)