diff --git a/install.sh b/install.sh
index 4738c39ac..f84f6734a 100755
--- a/install.sh
+++ b/install.sh
@@ -169,7 +169,7 @@ curl -L --progress-bar https://github.com/"${OWNER}"/"${REPO}"/tarball/"${BRANCH
 BOOTSTRAP_PACKAGES='zstd crew_mvdir ruby git ca_certificates libyaml openssl'
 
 # Older i686 systems.
-[[ "${ARCH}" == "i686" ]] && BOOTSTRAP_PACKAGES+=' zlibpkg gcc_lib'
+[[ "${ARCH}" == "i686" ]] && BOOTSTRAP_PACKAGES+=' zlib gcc_lib'
 
 if [[ -n "${CHROMEOS_RELEASE_CHROME_MILESTONE}" ]]; then
   # shellcheck disable=SC2231
@@ -185,10 +185,10 @@ if [[ -n "${CHROMEOS_RELEASE_CHROME_MILESTONE}" ]]; then
     [[ "${ARCH}" == "armv7l" ]] && BOOTSTRAP_PACKAGES+=' bzip2 ncurses readline pcre2 gcc_lib'
     if (( "${CHROMEOS_RELEASE_CHROME_MILESTONE}" < "123" )); then
       # Append the correct packages for systems running M122 and lower.
-      BOOTSTRAP_PACKAGES+=' glibc_lib235 zlibpkg gmp'
+      BOOTSTRAP_PACKAGES+=' glibc_lib235 zlib gmp'
     elif (( "${CHROMEOS_RELEASE_CHROME_MILESTONE}" > "122" )); then
       # Append the correct packages for systems running M123 onwards.
-      BOOTSTRAP_PACKAGES+=' glibc_lib237 zlibpkg gmp'
+      BOOTSTRAP_PACKAGES+=' glibc_lib237 zlib gmp'
     fi
   fi
 fi
diff --git a/lib/const.rb b/lib/const.rb
index 5c5e8f4ba..ff81e77ce 100644
--- a/lib/const.rb
+++ b/lib/const.rb
@@ -40,7 +40,7 @@ else
   HOME = File.join(CREW_PREFIX, Dir.home)
 end
 
-CREW_ESSENTIAL_PACKAGES = %w[gcc_lib glibc gmp ruby zlibpkg zstd]
+CREW_ESSENTIAL_PACKAGES = %w[gcc_lib glibc gmp ruby zlib zstd]
 
 CREW_IN_CONTAINER = File.exist?('/.dockerenv') || ENV.fetch('CREW_IN_CONTAINER', '0').eql?('1')
 
diff --git a/lib/fixup.rb b/lib/fixup.rb
index 92db60925..94e8e079e 100644
--- a/lib/fixup.rb
+++ b/lib/fixup.rb
@@ -75,7 +75,8 @@ pkg_update_arr = [
   { pkg_name: 'qtwebsockets', pkg_rename: 'qt5_websockets', pkg_deprecated: nil, comments: nil },
   { pkg_name: 'qtx11extras', pkg_rename: 'qt5_x11extras', pkg_deprecated: nil, comments: nil },
   { pkg_name: 'ruby_debug', pkg_rename: nil, pkg_deprecated: true, comments: 'Integrated into ruby package.' },
-  { pkg_name: 'wget', pkg_rename: 'wget2', pkg_deprecated: nil, comments: 'Renamed to better match upstream.' }
+  { pkg_name: 'wget', pkg_rename: 'wget2', pkg_deprecated: nil, comments: 'Renamed to better match upstream.' },
+  { pkg_name: 'zlibpkg', pkg_rename: 'zlib', pkg_deprecated: nil, comments: 'Renamed to better match upstream.' }
 ]
 
 pkg_update_arr.each do |pkg|
diff --git a/manifest/armv7l/z/zlibpkg.filelist b/manifest/armv7l/z/zlib.filelist
similarity index 100%
rename from manifest/armv7l/z/zlibpkg.filelist
rename to manifest/armv7l/z/zlib.filelist
diff --git a/manifest/i686/z/zlibpkg.filelist b/manifest/i686/z/zlib.filelist
similarity index 100%
rename from manifest/i686/z/zlibpkg.filelist
rename to manifest/i686/z/zlib.filelist
diff --git a/manifest/x86_64/z/zlibpkg.filelist b/manifest/x86_64/z/zlib.filelist
similarity index 100%
rename from manifest/x86_64/z/zlibpkg.filelist
rename to manifest/x86_64/z/zlib.filelist
diff --git a/packages/ag.rb b/packages/ag.rb
index f4bbf8bbe..520c0d9b0 100644
--- a/packages/ag.rb
+++ b/packages/ag.rb
@@ -22,7 +22,7 @@ class Ag < Package
   depends_on 'pkg_config' => :build
   depends_on 'pcre'
   depends_on 'xzutils'
-  depends_on 'zlibpkg'
+  depends_on 'zlib'
 
   def self.build
     system 'autoreconf', '-fiv'
diff --git a/packages/alsa_tools.rb b/packages/alsa_tools.rb
index e4c0bd547..1d18ec187 100644
--- a/packages/alsa_tools.rb
+++ b/packages/alsa_tools.rb
@@ -33,7 +33,7 @@ class Alsa_tools < Package
   depends_on 'libxfixes' # R
   depends_on 'libxrender' # R
   depends_on 'pango' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   def self.patch
     # Make sure automake can be found.
diff --git a/packages/atomicparsley.rb b/packages/atomicparsley.rb
index 0992b2eca..e795b537a 100644
--- a/packages/atomicparsley.rb
+++ b/packages/atomicparsley.rb
@@ -19,7 +19,7 @@ class Atomicparsley < Package
 
   depends_on 'autoconf'
   depends_on 'automake'
-  depends_on 'zlibpkg'
+  depends_on 'zlib'
 
   def self.build
     system './autogen.sh'
diff --git a/packages/bind.rb b/packages/bind.rb
index 33be0d2f5..8546cf237 100644
--- a/packages/bind.rb
+++ b/packages/bind.rb
@@ -34,7 +34,7 @@ class Bind < Autotools
   depends_on 'ncurses' => :build
   depends_on 'openssl' # R
   depends_on 'py3_ply' => :build
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   pre_configure_options "CFLAGS='#{CREW_ENV_OPTIONS_HASH['CFLAGS']} -DDIG_SIGCHASE'"
   configure_options '--enable-fixed-rrset \
diff --git a/packages/binutils.rb b/packages/binutils.rb
index 3dc99f0ee..03ee9d079 100644
--- a/packages/binutils.rb
+++ b/packages/binutils.rb
@@ -23,7 +23,7 @@ class Binutils < Package
   depends_on 'flex' # R
   depends_on 'gcc_lib' # R
   depends_on 'glibc' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
   depends_on 'zstd' # R
 
   def self.prebuild
diff --git a/packages/blender.rb b/packages/blender.rb
index 7b66626b8..5fa46c8f0 100644
--- a/packages/blender.rb
+++ b/packages/blender.rb
@@ -46,7 +46,7 @@ class Blender < CMake
   depends_on 'py3_requests'
   depends_on 'python3'
   depends_on 'tbb' # R
-  depends_on 'zlibpkg'
+  depends_on 'zlib'
   depends_on 'zstd'
 
   def self.patch
diff --git a/packages/boost.rb b/packages/boost.rb
index f1536c18a..f2d97c67b 100644
--- a/packages/boost.rb
+++ b/packages/boost.rb
@@ -23,7 +23,7 @@ class Boost < Package
   depends_on 'icu4c' # R
   depends_on 'python3' => :build
   depends_on 'xzutils' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
   depends_on 'zstd' # R
 
   def self.build
diff --git a/packages/btrfs_progs.rb b/packages/btrfs_progs.rb
index 4d4ce60d1..e3822707d 100644
--- a/packages/btrfs_progs.rb
+++ b/packages/btrfs_progs.rb
@@ -24,7 +24,7 @@ class Btrfs_progs < Autotools
   depends_on 'libgcrypt' # R
   depends_on 'lzo' # R
   depends_on 'util_linux' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
   depends_on 'zstd' # R
 
   configure_options '--disable-documentation \
diff --git a/packages/cairo.rb b/packages/cairo.rb
index 3c9a47708..a14d88ea9 100644
--- a/packages/cairo.rb
+++ b/packages/cairo.rb
@@ -29,7 +29,7 @@ class Cairo < Meson
   depends_on 'lzo' # R
   depends_on 'mesa' => :build
   depends_on 'pixman' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   conflicts_ok # because this overwrites the limited cairo from harfbuzz
 
diff --git a/packages/caja.rb b/packages/caja.rb
index 9e8a734ea..688cb3566 100644
--- a/packages/caja.rb
+++ b/packages/caja.rb
@@ -51,7 +51,7 @@ class Caja < Autotools
   depends_on 'pango' # R
   depends_on 'util_linux' # R
   depends_on 'wayland' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   gnome
 
diff --git a/packages/cmake.rb b/packages/cmake.rb
index 25a8219a7..373a1d699 100644
--- a/packages/cmake.rb
+++ b/packages/cmake.rb
@@ -31,7 +31,7 @@ class Cmake < CMake
   depends_on 'llvm18_lib' => :build
   depends_on 'ncurses' # R
   depends_on 'xzutils' => :build
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
   depends_on 'zstd' => :build
 
   cmake_options '-DCMAKE_USE_SYSTEM_LIBRARIES=ON \
diff --git a/packages/core.rb b/packages/core.rb
index 423cd20da..5a9873946 100644
--- a/packages/core.rb
+++ b/packages/core.rb
@@ -83,6 +83,6 @@ class Core < Package
   depends_on 'xzutils'
   depends_on 'xxhash'
   depends_on 'zip'
-  depends_on 'zlibpkg'
+  depends_on 'zlib'
   depends_on 'zstd'
 end
diff --git a/packages/cups.rb b/packages/cups.rb
index 6c508a507..ebc4dd616 100644
--- a/packages/cups.rb
+++ b/packages/cups.rb
@@ -25,7 +25,7 @@ class Cups < Package
   depends_on 'llvm18_dev' => :build if %w[armv7l aarch64].include?(ARCH)
   depends_on 'openssl' # R
   depends_on 'psmisc' # L
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   no_env_options
   no_fhs
diff --git a/packages/curl.rb b/packages/curl.rb
index e72cbc026..8d13941f9 100644
--- a/packages/curl.rb
+++ b/packages/curl.rb
@@ -32,7 +32,7 @@ class Curl < Autotools
   depends_on 'python3' => :build
   depends_on 'rust' => :build
   depends_on 'valgrind' => :build
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
   depends_on 'zstd' # R
 
   configure_options "--disable-maintainer-mode \
diff --git a/packages/devil.rb b/packages/devil.rb
index e3b8b0c2b..d014ede6b 100644
--- a/packages/devil.rb
+++ b/packages/devil.rb
@@ -29,7 +29,7 @@ class Devil < Package
   depends_on 'mesa'
   depends_on 'gcc_lib' # R
   depends_on 'glibc' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
   depends_on 'libglvnd' # R
 
   def self.patch
diff --git a/packages/dia.rb b/packages/dia.rb
index 72fd0c51c..3b0c79766 100644
--- a/packages/dia.rb
+++ b/packages/dia.rb
@@ -37,7 +37,7 @@ class Dia < Meson
   depends_on 'py3_six' => :build
   depends_on 'python3' # R
   depends_on 'swig1' => :build
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   gnome
 
diff --git a/packages/distcc.rb b/packages/distcc.rb
index 471612586..9d43964ea 100644
--- a/packages/distcc.rb
+++ b/packages/distcc.rb
@@ -31,7 +31,7 @@ class Distcc < Autotools
   depends_on 'nss_mdns' # R
   depends_on 'popt' # R
   depends_on 'python3' => :build
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   print_source_bashrc
 
diff --git a/packages/elfutils.rb b/packages/elfutils.rb
index 22b37135c..a4779b546 100644
--- a/packages/elfutils.rb
+++ b/packages/elfutils.rb
@@ -25,7 +25,7 @@ class Elfutils < Autotools
   depends_on 'libmicrohttpd' # R
   depends_on 'sqlite' # R
   depends_on 'xzutils' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
   depends_on 'zstd' # R
 
   pre_configure_options "CFLAGS+=' -Wno-error ' CXXFLAGS+=' -Wno-error '"
diff --git a/packages/elinks.rb b/packages/elinks.rb
index 388422c7b..30e96c374 100644
--- a/packages/elinks.rb
+++ b/packages/elinks.rb
@@ -27,7 +27,7 @@ class Elinks < Meson
   depends_on 'lzip' => :build
   depends_on 'openssl' # R
   depends_on 'tre' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   meson_options '-Dcgi=true \
     -D256-colors=true \
diff --git a/packages/emacs.rb b/packages/emacs.rb
index e3d058e72..87fd83660 100644
--- a/packages/emacs.rb
+++ b/packages/emacs.rb
@@ -28,7 +28,7 @@ class Emacs < Package
   depends_on 'jansson' # R
   depends_on 'libxml2' # R
   depends_on 'ncurses' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
   depends_on 'sqlite' # R
 
   def self.build
diff --git a/packages/ettercap.rb b/packages/ettercap.rb
index dcb8a5dd2..2aff2ce55 100644
--- a/packages/ettercap.rb
+++ b/packages/ettercap.rb
@@ -33,7 +33,7 @@ class Ettercap < Package
   depends_on 'ncurses' # R
   depends_on 'openssl' # R
   depends_on 'pcre' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   def self.build
     system "cmake -B builddir #{CREW_CMAKE_OPTIONS} \
diff --git a/packages/ettercap_gtk.rb b/packages/ettercap_gtk.rb
index 486456a73..4b7c45ae7 100644
--- a/packages/ettercap_gtk.rb
+++ b/packages/ettercap_gtk.rb
@@ -39,7 +39,7 @@ class Ettercap_gtk < Package
   depends_on 'openssl' # R
   depends_on 'pango' # R
   depends_on 'pcre' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   def self.patch
     system "sed -i 's,list(APPEND GTK3_INCLUDE_DIRS ${FREETYPE_INCLUDE_DIRS}),list(APPEND GTK3_INCLUDE_DIRS ${FREETYPE_INCLUDE_DIRS} #{CREW_PREFIX}/include/harfbuzz),g' cmake/Modules/FindGTK3.cmake"
diff --git a/packages/evince.rb b/packages/evince.rb
index 9ae5c38b8..9b549d16e 100644
--- a/packages/evince.rb
+++ b/packages/evince.rb
@@ -44,7 +44,7 @@ class Evince < Meson
   depends_on 'poppler' # R
   depends_on 'py3_gi_docgen' => :build
   depends_on 'valgrind' => :build
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   gnome
 
diff --git a/packages/evolution_data_server.rb b/packages/evolution_data_server.rb
index 37f3e4fea..87a2bc570 100644
--- a/packages/evolution_data_server.rb
+++ b/packages/evolution_data_server.rb
@@ -48,7 +48,7 @@ class Evolution_data_server < CMake
   depends_on 'vulkan_icd_loader' # R
   depends_on 'webkit2gtk_4_1' # R
   depends_on 'webkitgtk_6' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   gnome
 
diff --git a/packages/exempi.rb b/packages/exempi.rb
index f82d2c560..c41d996cf 100644
--- a/packages/exempi.rb
+++ b/packages/exempi.rb
@@ -25,5 +25,5 @@ class Exempi < Autotools
   depends_on 'expat' # R
   depends_on 'gcc_lib' # R
   depends_on 'glibc' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 end
diff --git a/packages/ffmpeg.rb b/packages/ffmpeg.rb
index 7e7ffac54..7483543ac 100644
--- a/packages/ffmpeg.rb
+++ b/packages/ffmpeg.rb
@@ -95,7 +95,7 @@ class Ffmpeg < Package
   depends_on 'xzutils' # R
   depends_on 'zeromq' # R
   depends_on 'zimg' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
   depends_on 'zvbi' # R
 
   no_env_options if %w[aarch64 armv7l].include? ARCH
diff --git a/packages/ffmpegthumbnailer.rb b/packages/ffmpegthumbnailer.rb
index a306a6fef..432c3a16c 100644
--- a/packages/ffmpegthumbnailer.rb
+++ b/packages/ffmpegthumbnailer.rb
@@ -21,7 +21,7 @@ class Ffmpegthumbnailer < Package
   depends_on 'glibc' # R
   depends_on 'libjpeg_turbo' # R
   depends_on 'libpng' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   def self.build
     system "mold -run cmake -B builddir #{CREW_CMAKE_OPTIONS} \
diff --git a/packages/filecmd.rb b/packages/filecmd.rb
index 0dcd32b02..040a1e4a8 100644
--- a/packages/filecmd.rb
+++ b/packages/filecmd.rb
@@ -22,7 +22,7 @@ class Filecmd < Package
   depends_on 'glibc' # R
   depends_on 'lzlib' # R Fixes checking lzlib.h usability... no
   depends_on 'xzutils' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
   depends_on 'zstd' # R
 
   def self.prebuild
diff --git a/packages/filezilla.rb b/packages/filezilla.rb
index 2f5ea7920..f08f7353a 100644
--- a/packages/filezilla.rb
+++ b/packages/filezilla.rb
@@ -40,7 +40,7 @@ class Filezilla < Package
   depends_on 'wxwidgets' # R
   depends_on 'xcb_util' => :build
   depends_on 'xdg_utils' => :build
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   print_source_bashrc
 
diff --git a/packages/fragments.rb b/packages/fragments.rb
index 78e632769..4e87239dc 100644
--- a/packages/fragments.rb
+++ b/packages/fragments.rb
@@ -32,7 +32,7 @@ class Fragments < Meson
   depends_on 'pango' # R
   depends_on 'rust' => :build
   depends_on 'transmission' # L
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   gnome
 end
diff --git a/packages/freetype.rb b/packages/freetype.rb
index f0b5222ef..75d193f91 100644
--- a/packages/freetype.rb
+++ b/packages/freetype.rb
@@ -28,7 +28,7 @@ class Freetype < Meson
   depends_on 'libpng' # R
   depends_on 'pcre' => :build
   depends_on 'py3_docwriter' => :build
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   meson_options '-Dharfbuzz=enabled'
 
diff --git a/packages/gcab.rb b/packages/gcab.rb
index a6fdfcb04..451c702c4 100644
--- a/packages/gcab.rb
+++ b/packages/gcab.rb
@@ -20,7 +20,7 @@ class Gcab < Meson
   depends_on 'gobject_introspection' => :build
   depends_on 'glib' # R
   depends_on 'glibc' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   gnome
 
diff --git a/packages/gcc10.rb b/packages/gcc10.rb
index 6ecf80aaa..d6c20efb8 100644
--- a/packages/gcc10.rb
+++ b/packages/gcc10.rb
@@ -25,7 +25,7 @@ class Gcc10 < Package
   depends_on 'libssp' # L
   depends_on 'mpc' # R
   depends_on 'mpfr' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
   depends_on 'zstd' # R
   depends_on 'gcc_lib' # R
 
diff --git a/packages/gcc_build.rb b/packages/gcc_build.rb
index 821ad9b1a..475e0ffe9 100644
--- a/packages/gcc_build.rb
+++ b/packages/gcc_build.rb
@@ -38,7 +38,7 @@ class Gcc_build < Package
   depends_on 'libssp' # L
   depends_on 'mpc' # R
   depends_on 'mpfr' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
   depends_on 'zstd' # R
 
   no_env_options
diff --git a/packages/gcc_dev.rb b/packages/gcc_dev.rb
index 79a89556a..4b316f236 100644
--- a/packages/gcc_dev.rb
+++ b/packages/gcc_dev.rb
@@ -39,7 +39,7 @@ class Gcc_dev < Package
   depends_on 'libssp' # L
   depends_on 'mpc' # R
   depends_on 'mpfr' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
   depends_on 'zstd' # R
 
   no_shrink
diff --git a/packages/gdal.rb b/packages/gdal.rb
index 5ed52422c..1d1bb62b9 100644
--- a/packages/gdal.rb
+++ b/packages/gdal.rb
@@ -47,7 +47,7 @@ class Gdal < CMake
   depends_on 'unixodbc' # R
   depends_on 'xercesc' # R
   depends_on 'xzutils' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
   depends_on 'zstd' # R
 
   cmake_options '-DGDAL_USE_TIFF_INTERNAL=ON \
diff --git a/packages/gdb.rb b/packages/gdb.rb
index 998ee7923..4b06083fa 100644
--- a/packages/gdb.rb
+++ b/packages/gdb.rb
@@ -35,7 +35,7 @@ class Gdb < Autotools
   depends_on 'texinfo' => :build
   depends_on 'xxhash' # R
   depends_on 'xzutils' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
   depends_on 'zstd' # R
 
   conflicts_ok # binutils conflicts
diff --git a/packages/gdk_pixbuf.rb b/packages/gdk_pixbuf.rb
index 3eaf62578..5cc5ae1a6 100644
--- a/packages/gdk_pixbuf.rb
+++ b/packages/gdk_pixbuf.rb
@@ -34,7 +34,7 @@ class Gdk_pixbuf < Package
   depends_on 'py3_typogrify' => :build
   depends_on 'glibc' # R
   depends_on 'libpng' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   gnome
 
diff --git a/packages/geany_plugins.rb b/packages/geany_plugins.rb
index 874b994e1..8a7520718 100644
--- a/packages/geany_plugins.rb
+++ b/packages/geany_plugins.rb
@@ -37,5 +37,5 @@ class Geany_plugins < Autotools
   depends_on 'valgrind' => :build
   depends_on 'vte' # R
   depends_on 'webkit2gtk_4' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 end
diff --git a/packages/gegl.rb b/packages/gegl.rb
index 1d2feec8a..010d5a3ec 100644
--- a/packages/gegl.rb
+++ b/packages/gegl.rb
@@ -43,7 +43,7 @@ class Gegl < Meson
   depends_on 'poppler' # R
   depends_on 'source_highlight' => :build
   depends_on 'vala' => :build
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   meson_options '-Dlibjpeg=enabled \
       -Dlibpng=enabled'
diff --git a/packages/gemacs.rb b/packages/gemacs.rb
index 6501988bd..318a21120 100644
--- a/packages/gemacs.rb
+++ b/packages/gemacs.rb
@@ -62,7 +62,7 @@ class Gemacs < Package
   depends_on 'texinfo'
   depends_on 'webkit2gtk_4'
   depends_on 'xcb_util' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   def self.build
     system '[ -x configure ] || NOCONFIGURE=1 ./autogen.sh'
diff --git a/packages/get_iplayer.rb b/packages/get_iplayer.rb
index e11efa100..fa56bdcdc 100644
--- a/packages/get_iplayer.rb
+++ b/packages/get_iplayer.rb
@@ -22,7 +22,7 @@ class Get_iplayer < Package
   depends_on 'ffmpeg'
   depends_on 'atomicparsley'
   depends_on 'libxml2'
-  depends_on 'zlibpkg'
+  depends_on 'zlib'
 
   def self.build; end
 
diff --git a/packages/gettext.rb b/packages/gettext.rb
index 41e861d5b..d285a36db 100644
--- a/packages/gettext.rb
+++ b/packages/gettext.rb
@@ -25,7 +25,7 @@ class Gettext < Autotools
   depends_on 'libunistring' # R
   depends_on 'libxml2' # R
   depends_on 'openjdk8' => :build
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   no_env_options
 
diff --git a/packages/ghostscript.rb b/packages/ghostscript.rb
index b074e3c8d..4fc001e32 100644
--- a/packages/ghostscript.rb
+++ b/packages/ghostscript.rb
@@ -44,7 +44,7 @@ class Ghostscript < Package
   depends_on 'neon' # R
   depends_on 'openjpeg' # R
   depends_on 'pango' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   no_lto
 
diff --git a/packages/gimp.rb b/packages/gimp.rb
index 3936e7883..e63f30359 100644
--- a/packages/gimp.rb
+++ b/packages/gimp.rb
@@ -84,7 +84,7 @@ class Gimp < Meson
   depends_on 'vala' => :build
   depends_on 'xdg_base' => :build
   depends_on 'xzutils' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   gnome
 
diff --git a/packages/git.rb b/packages/git.rb
index 6abc5b8e3..3ee1bff17 100644
--- a/packages/git.rb
+++ b/packages/git.rb
@@ -23,7 +23,7 @@ class Git < Package
   depends_on 'glibc' # R
   depends_on 'libunistring' # R
   depends_on 'pcre2' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   print_source_bashrc
 
diff --git a/packages/glib.rb b/packages/glib.rb
index 45c00e79b..e089fad72 100644
--- a/packages/glib.rb
+++ b/packages/glib.rb
@@ -25,7 +25,7 @@ class Glib < Meson
   depends_on 'py3_pygments' => :build
   depends_on 'shared_mime_info' # L
   depends_on 'util_linux' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   gnome
   no_strip if %w[aarch64 armv7l].include? ARCH
diff --git a/packages/gmime.rb b/packages/gmime.rb
index bbb947ec3..b2a962665 100644
--- a/packages/gmime.rb
+++ b/packages/gmime.rb
@@ -24,7 +24,7 @@ class Gmime < Autotools
   depends_on 'libidn2' # R
   depends_on 'libunistring' # R
   depends_on 'vala' => :build
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   gnome
 end
diff --git a/packages/gnome_autoar.rb b/packages/gnome_autoar.rb
index 2d0efb0fd..e77c090bc 100644
--- a/packages/gnome_autoar.rb
+++ b/packages/gnome_autoar.rb
@@ -30,7 +30,7 @@ class Gnome_autoar < Meson
   depends_on 'libjpeg_turbo' => :build
   depends_on 'pango' # R
   depends_on 'vala' => :build
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   gnome
 end
diff --git a/packages/gnome_docking_library.rb b/packages/gnome_docking_library.rb
index 453c000e8..228165719 100644
--- a/packages/gnome_docking_library.rb
+++ b/packages/gnome_docking_library.rb
@@ -28,7 +28,7 @@ class Gnome_docking_library < Autotools
   depends_on 'icu4c' # R
   depends_on 'libxml2' # R
   depends_on 'pango' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   gnome
 end
diff --git a/packages/gnome_keyring.rb b/packages/gnome_keyring.rb
index 91b7c6c36..39d03e644 100644
--- a/packages/gnome_keyring.rb
+++ b/packages/gnome_keyring.rb
@@ -36,7 +36,7 @@ class Gnome_keyring < Autotools
   depends_on 'openssh' => :build
   depends_on 'p11kit' # R
   depends_on 'pango' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   gnome
 
diff --git a/packages/gnuastro.rb b/packages/gnuastro.rb
index a152ce244..6ae48f463 100644
--- a/packages/gnuastro.rb
+++ b/packages/gnuastro.rb
@@ -27,5 +27,5 @@ class Gnuastro < Autotools
   depends_on 'libtiff'
   depends_on 'wcslib'
   depends_on 'xzutils'
-  depends_on 'zlibpkg'
+  depends_on 'zlib'
 end
diff --git a/packages/gnupg.rb b/packages/gnupg.rb
index 04b19e06c..9799dc961 100644
--- a/packages/gnupg.rb
+++ b/packages/gnupg.rb
@@ -32,7 +32,7 @@ class Gnupg < Autotools
   depends_on 'potrace' => :build
   depends_on 'readline' # R
   depends_on 'sqlite' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   configure_options '--with-zlib \
     --with-bzip2 \
diff --git a/packages/gnutls.rb b/packages/gnutls.rb
index 117f839ba..74f1941ea 100644
--- a/packages/gnutls.rb
+++ b/packages/gnutls.rb
@@ -31,7 +31,7 @@ class Gnutls < Autotools
   depends_on 'openssl' # R
   depends_on 'p11kit' # R
   depends_on 'trousers' => :build
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
   depends_on 'zstd' # R
 
   no_lto
diff --git a/packages/graphicsmagick.rb b/packages/graphicsmagick.rb
index 80f9f69d0..d2825b9e9 100644
--- a/packages/graphicsmagick.rb
+++ b/packages/graphicsmagick.rb
@@ -52,7 +52,7 @@ class Graphicsmagick < Package
   depends_on 'py3_docutils' => :build
   depends_on 'util_linux' # R
   depends_on 'xzutils' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
   depends_on 'zstd' # R
 
   no_env_options
diff --git a/packages/graphviz.rb b/packages/graphviz.rb
index fa9d67b70..d8e5fec60 100644
--- a/packages/graphviz.rb
+++ b/packages/graphviz.rb
@@ -34,7 +34,7 @@ class Graphviz < CMake
   depends_on 'libxrender' # R
   depends_on 'pango' # R
   depends_on 'qt5_base' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   def self.install
     # There is a library error only when installing dot using the following command.
diff --git a/packages/gspell.rb b/packages/gspell.rb
index 6a33f01dc..db75424d0 100644
--- a/packages/gspell.rb
+++ b/packages/gspell.rb
@@ -38,7 +38,7 @@ class Gspell < Autotools
   depends_on 'ncurses' => :build
   depends_on 'pango' # R
   depends_on 'vala' => :build
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   gnome
 end
diff --git a/packages/gstreamer.rb b/packages/gstreamer.rb
index 2f841fedc..96362a042 100644
--- a/packages/gstreamer.rb
+++ b/packages/gstreamer.rb
@@ -119,7 +119,7 @@ class Gstreamer < Meson
   depends_on 'wavpack' # R
   depends_on 'wayland' # R
   depends_on 'webrtc_audio_processing' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
   depends_on 'zvbi' # R
 
   gnome
diff --git a/packages/gtk4.rb b/packages/gtk4.rb
index 6958d6c0a..da91228b8 100644
--- a/packages/gtk4.rb
+++ b/packages/gtk4.rb
@@ -71,7 +71,7 @@ class Gtk4 < Meson
   depends_on 'vulkan_icd_loader' # R
   depends_on 'wayland' # R
   depends_on 'xdg_base' # L
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   gnome
   no_fhs
diff --git a/packages/gtk_vnc.rb b/packages/gtk_vnc.rb
index d14119d22..56c02b7b3 100644
--- a/packages/gtk_vnc.rb
+++ b/packages/gtk_vnc.rb
@@ -28,7 +28,7 @@ class Gtk_vnc < Meson
   depends_on 'harfbuzz' # R
   depends_on 'libcyrussasl' # R
   depends_on 'libx11' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
   depends_on 'gcc_lib' # R
 
   gnome
diff --git a/packages/gtksourceview_3.rb b/packages/gtksourceview_3.rb
index 885364752..6e1c50917 100644
--- a/packages/gtksourceview_3.rb
+++ b/packages/gtksourceview_3.rb
@@ -36,7 +36,7 @@ class Gtksourceview_3 < Autotools
   depends_on 'pango' # R
   depends_on 'vala' => :build
   depends_on 'vulkan_icd_loader' => :build
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   gnome
   no_upstream_update
diff --git a/packages/gtksourceview_4.rb b/packages/gtksourceview_4.rb
index 028dd7851..fd51ed9c3 100644
--- a/packages/gtksourceview_4.rb
+++ b/packages/gtksourceview_4.rb
@@ -34,7 +34,7 @@ class Gtksourceview_4 < Meson
   depends_on 'vulkan_icd_loader'
   depends_on 'glibc' # R
   depends_on 'libxml2' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   gnome
   no_upstream_update
diff --git a/packages/handbrake.rb b/packages/handbrake.rb
index b00f879ca..221a7f94c 100644
--- a/packages/handbrake.rb
+++ b/packages/handbrake.rb
@@ -57,7 +57,7 @@ class Handbrake < Package
   depends_on 'wayland_protocols' => :build
   depends_on 'xcb_util' => :build
   depends_on 'xzutils' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   no_lto
 
diff --git a/packages/harfbuzz.rb b/packages/harfbuzz.rb
index 885d060cd..1512f7a95 100644
--- a/packages/harfbuzz.rb
+++ b/packages/harfbuzz.rb
@@ -44,7 +44,7 @@ class Harfbuzz < Meson
   depends_on 'patchelf' => :build
   depends_on 'pcre' => :build
   depends_on 'pixman' # R Needed for cairo subproject.
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   # provides freetype (sans harfbuzz), ragel, and a non-x11 cairo stub
 
diff --git a/packages/hplip.rb b/packages/hplip.rb
index 170590673..a4313cbec 100644
--- a/packages/hplip.rb
+++ b/packages/hplip.rb
@@ -21,7 +21,7 @@ class Hplip < Package
   depends_on 'gcc_lib' # R
   depends_on 'glibc' # R
   depends_on 'libusb' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   def self.patch
     system "curl -Ls -o config.guess 'https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD'"
diff --git a/packages/ibus.rb b/packages/ibus.rb
index 1b1a00df9..bc0865090 100644
--- a/packages/ibus.rb
+++ b/packages/ibus.rb
@@ -54,7 +54,7 @@ class Ibus < Autotools
   depends_on 'vulkan_headers' => :build
   depends_on 'vulkan_icd_loader' # R
   depends_on 'wayland' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   def self.patch
     system "sed -i 's|/usr/bin/python|#{CREW_PREFIX}/bin/python3|' engine/gensimple.py"
diff --git a/packages/icecream.rb b/packages/icecream.rb
index 338bb02b8..df7372ac5 100644
--- a/packages/icecream.rb
+++ b/packages/icecream.rb
@@ -38,7 +38,7 @@ class Icecream < Package
   depends_on 'perl_xml_sax_base' => :build
   depends_on 'perl_xml_sax' => :build
   depends_on 'xzutils' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
   depends_on 'zstd' # R
 
   def self.patch
diff --git a/packages/imagemagick7.rb b/packages/imagemagick7.rb
index cdf01bdff..9074fad8d 100644
--- a/packages/imagemagick7.rb
+++ b/packages/imagemagick7.rb
@@ -62,7 +62,7 @@ class Imagemagick7 < Autotools
   depends_on 'pango' # R
   depends_on 'util_linux' # R
   depends_on 'xzutils' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
   depends_on 'zstd' # R
 
   no_upstream_update
diff --git a/packages/imlib2.rb b/packages/imlib2.rb
index 137fff26e..4063cab43 100644
--- a/packages/imlib2.rb
+++ b/packages/imlib2.rb
@@ -48,7 +48,7 @@ class Imlib2 < Package
   depends_on 'openjpeg' # R
   depends_on 'pango' # R
   depends_on 'xzutils' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
   depends_on 'zstd' # R
 
   def self.build
diff --git a/packages/inkscape.rb b/packages/inkscape.rb
index 0b06fd68d..249da422c 100644
--- a/packages/inkscape.rb
+++ b/packages/inkscape.rb
@@ -66,7 +66,7 @@ class Inkscape < CMake
   depends_on 'py3_cython' => :build
   depends_on 'readline' # R
   depends_on 'xdg_base' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   gnome
 
diff --git a/packages/irrlicht.rb b/packages/irrlicht.rb
index d27d5deee..af3eb2a77 100644
--- a/packages/irrlicht.rb
+++ b/packages/irrlicht.rb
@@ -26,7 +26,7 @@ class Irrlicht < Package
   depends_on 'gcc_lib' # R
   depends_on 'glibc' # R
   depends_on 'mesa' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   def self.patch
     system 'curl -#LO https://dev.gentoo.org/~mgorny/dist/irrlicht-1.8.4-patchset.tar.bz2'
diff --git a/packages/jellyfin_media_player.rb b/packages/jellyfin_media_player.rb
index 0612d43e4..e1d3593c0 100644
--- a/packages/jellyfin_media_player.rb
+++ b/packages/jellyfin_media_player.rb
@@ -44,7 +44,7 @@ class Jellyfin_media_player < Package
   depends_on 'qt5_x11extras' # R
   depends_on 'shaderc' # L
   depends_on 'sommelier' # L
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   def self.patch
     system "sed -i 's/gold/#{CREW_LINKER}/g' CMakeModules/CompilerFlags.cmake"
diff --git a/packages/js102.rb b/packages/js102.rb
index 6c84de8a1..3ffd9718b 100644
--- a/packages/js102.rb
+++ b/packages/js102.rb
@@ -28,7 +28,7 @@ class Js102 < Package
   depends_on 'nss' # R
   depends_on 'readline' # R
   depends_on 'rust' => :build
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   no_upstream_update
 
diff --git a/packages/js115.rb b/packages/js115.rb
index 4e0022415..b1133da6b 100644
--- a/packages/js115.rb
+++ b/packages/js115.rb
@@ -32,7 +32,7 @@ class Js115 < Package
   depends_on 'py3_pycairo' => :build
   depends_on 'readline' # R
   depends_on 'rust' => :build
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   no_upstream_update
 
diff --git a/packages/ldc.rb b/packages/ldc.rb
index 9b91b8e29..59ba89dd3 100644
--- a/packages/ldc.rb
+++ b/packages/ldc.rb
@@ -11,7 +11,7 @@ class Ldc < Package
 
   depends_on 'curl'
   depends_on 'ncurses'
-  depends_on 'zlibpkg'
+  depends_on 'zlib'
 
   no_compile_needed
   print_source_bashrc
diff --git a/packages/leptonica.rb b/packages/leptonica.rb
index 09ed004ff..44efd1696 100644
--- a/packages/leptonica.rb
+++ b/packages/leptonica.rb
@@ -26,7 +26,7 @@ class Leptonica < Package
   depends_on 'libwebp' # R
   depends_on 'openjpeg' # R
   depends_on 'xzutils' => :build
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
   depends_on 'zstd' => :build
 
   def self.patch
diff --git a/packages/libarchive.rb b/packages/libarchive.rb
index 5af03cb6b..648f77720 100644
--- a/packages/libarchive.rb
+++ b/packages/libarchive.rb
@@ -27,7 +27,7 @@ class Libarchive < Autotools
   depends_on 'lz4' # R
   depends_on 'openssl' # R
   depends_on 'xzutils' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
   depends_on 'zstd' # R
 
   def self.install
diff --git a/packages/libavif.rb b/packages/libavif.rb
index 0f0efd795..491a1e3ae 100644
--- a/packages/libavif.rb
+++ b/packages/libavif.rb
@@ -33,7 +33,7 @@ class Libavif < CMake
   depends_on 'pkgconf' => :build
   depends_on 'rav1e' # R
   depends_on 'svt_av1' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   gnome
 
diff --git a/packages/libbpf.rb b/packages/libbpf.rb
index 39728b723..622502086 100644
--- a/packages/libbpf.rb
+++ b/packages/libbpf.rb
@@ -23,7 +23,7 @@ class Libbpf < Package
   depends_on 'gcc_lib' # R
   depends_on 'glibc' # R
   depends_on 'rsync' => :build
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   def self.patch
     system "sed -i 's,PREFIX ?= /usr,PREFIX ?= #{CREW_PREFIX},g' src/Makefile"
diff --git a/packages/libcaca.rb b/packages/libcaca.rb
index 10195135b..80102a169 100644
--- a/packages/libcaca.rb
+++ b/packages/libcaca.rb
@@ -36,7 +36,7 @@ class Libcaca < Package
   depends_on 'python3'
   depends_on 'ruby' # R
   depends_on 'slang' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   def self.patch
     downloader 'https://patch-diff.githubusercontent.com/raw/cacalabs/libcaca/pull/66.patch',
diff --git a/packages/libcdr.rb b/packages/libcdr.rb
index 58f97afdd..da13c8b34 100644
--- a/packages/libcdr.rb
+++ b/packages/libcdr.rb
@@ -29,5 +29,5 @@ class Libcdr < Autotools
   depends_on 'lcms' # R
   depends_on 'librevenge' # R
   depends_on 'libwpg' => :build
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 end
diff --git a/packages/libefl.rb b/packages/libefl.rb
index 0f47de299..fe2ef3b00 100644
--- a/packages/libefl.rb
+++ b/packages/libefl.rb
@@ -75,7 +75,7 @@ class Libefl < Package
   depends_on 'libxkbcommon' # R
   depends_on 'libxtst' # R
   depends_on 'util_linux' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   def self.build
     system "meson setup #{CREW_MESON_OPTIONS} \
diff --git a/packages/libexiv2.rb b/packages/libexiv2.rb
index 5a886ab90..0f3ef7596 100644
--- a/packages/libexiv2.rb
+++ b/packages/libexiv2.rb
@@ -23,7 +23,7 @@ class Libexiv2 < Package
   depends_on 'gcc_lib' # R
   depends_on 'glibc' # R
   depends_on 'curl' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   def self.patch
     system "sed -i 's/MINGW OR CYGWIN OR CMAKE_HOST_SOLARIS/UNIX/g' cmake/compilerFlags.cmake"
diff --git a/packages/libfontenc.rb b/packages/libfontenc.rb
index 0181e6d33..aceeb8646 100644
--- a/packages/libfontenc.rb
+++ b/packages/libfontenc.rb
@@ -19,7 +19,7 @@ class Libfontenc < Package
 
   depends_on 'xorg_proto'
   depends_on 'glibc' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   def self.build
     system '[ -x configure ] || NOCONFIGURE=1 ./autogen.sh'
diff --git a/packages/libgdiplus.rb b/packages/libgdiplus.rb
index 8315c5e53..d4a2e890b 100644
--- a/packages/libgdiplus.rb
+++ b/packages/libgdiplus.rb
@@ -34,7 +34,7 @@ class Libgdiplus < Package
   depends_on 'libdeflate' # R
   depends_on 'pango' # R
   depends_on 'xzutils' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
   depends_on 'zstd' # R
 
   def self.build
diff --git a/packages/libgit2.rb b/packages/libgit2.rb
index 086612053..6ee5a87ca 100644
--- a/packages/libgit2.rb
+++ b/packages/libgit2.rb
@@ -22,7 +22,7 @@ class Libgit2 < CMake
   depends_on 'openssl' # R
   depends_on 'pcre' # R
   depends_on 'python3' # L
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   cmake_options '-DUSE_SSH=ON -DUSE_BUNDLED_ZLIB=OFF'
   # Tests #3 and #8 fail in containers
diff --git a/packages/libgsf.rb b/packages/libgsf.rb
index dfe7dc650..23b75efab 100644
--- a/packages/libgsf.rb
+++ b/packages/libgsf.rb
@@ -24,7 +24,7 @@ class Libgsf < Autotools
   depends_on 'glibc' # R
   depends_on 'icu4c' # R
   depends_on 'libxml2' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
   depends_on 'gdk_pixbuf' # R
 
   gnome
diff --git a/packages/libhandy.rb b/packages/libhandy.rb
index a45102395..5209c9c49 100644
--- a/packages/libhandy.rb
+++ b/packages/libhandy.rb
@@ -29,7 +29,7 @@ class Libhandy < Meson
   depends_on 'libjpeg_turbo' => :build
   depends_on 'pango' # R
   depends_on 'vala' => :build
-  depends_on 'zlibpkg' => :build
+  depends_on 'zlib' => :build
 
   gnome
 
diff --git a/packages/libheif.rb b/packages/libheif.rb
index 9fa013ebf..4db770c74 100644
--- a/packages/libheif.rb
+++ b/packages/libheif.rb
@@ -32,7 +32,7 @@ class Libheif < Package
   depends_on 'libx265' # R
   depends_on 'rav1e' # R
   depends_on 'svt_av1' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   gnome
 
diff --git a/packages/libjxl.rb b/packages/libjxl.rb
index 772f46780..541e26777 100644
--- a/packages/libjxl.rb
+++ b/packages/libjxl.rb
@@ -38,7 +38,7 @@ class Libjxl < Package
   depends_on 'openexr' # R
   depends_on 'pango' => :build
   depends_on 'xdg_utils' => :build
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   no_env_options
 
diff --git a/packages/libmediainfo.rb b/packages/libmediainfo.rb
index 7567c92db..c2a30adfa 100644
--- a/packages/libmediainfo.rb
+++ b/packages/libmediainfo.rb
@@ -19,7 +19,7 @@ class Libmediainfo < Package
 
   depends_on 'gcc_lib' # R
   depends_on 'glibc' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   def self.patch
     # Fix /usr/bin/file: No such file or directory
diff --git a/packages/libmetalink.rb b/packages/libmetalink.rb
index 9b5358888..16ecc3ba8 100644
--- a/packages/libmetalink.rb
+++ b/packages/libmetalink.rb
@@ -20,7 +20,7 @@ class Libmetalink < Package
   depends_on 'glibc' # R
   depends_on 'icu4c' # R
   depends_on 'libxml2' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   def self.patch
     downloader 'https://launchpadlibrarian.net/380798344/0001-fix-covscan-issues.patch',
diff --git a/packages/libmng.rb b/packages/libmng.rb
index 484db8e00..ca3aeaa99 100644
--- a/packages/libmng.rb
+++ b/packages/libmng.rb
@@ -20,7 +20,7 @@ class Libmng < Autotools
   depends_on 'lcms'
   depends_on 'libjpeg_turbo'
   depends_on 'glibc' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   gnome
 end
diff --git a/packages/libpng.rb b/packages/libpng.rb
index 58f01b08b..6b523553b 100644
--- a/packages/libpng.rb
+++ b/packages/libpng.rb
@@ -17,7 +17,7 @@ class Libpng < Package
      x86_64: 'cc55bf8441e29ac7bcfb0b80d7903cbb5816df85ffd052376de6396b18c80cf5'
   })
 
-  depends_on 'zlibpkg'
+  depends_on 'zlib'
   depends_on 'glibc' # R
   depends_on 'glibc_lib' # R
 
diff --git a/packages/libraw.rb b/packages/libraw.rb
index 2b9428542..ae42167ee 100644
--- a/packages/libraw.rb
+++ b/packages/libraw.rb
@@ -22,7 +22,7 @@ class Libraw < Package
   depends_on 'gcc_lib' # R
   depends_on 'glibc' # R
   depends_on 'libjpeg_turbo' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   def self.build
     system 'autoreconf -fiv'
diff --git a/packages/librevenge.rb b/packages/librevenge.rb
index bd08d0c6b..674fb31df 100644
--- a/packages/librevenge.rb
+++ b/packages/librevenge.rb
@@ -25,7 +25,7 @@ class Librevenge < Package
   depends_on 'doxygen' => :build
   depends_on 'gcc_lib' # R
   depends_on 'glibc' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   def self.build
     system "./configure #{CREW_OPTIONS} --disable-werror"
diff --git a/packages/librsvg.rb b/packages/librsvg.rb
index 4dc602a22..0ce32b9ce 100644
--- a/packages/librsvg.rb
+++ b/packages/librsvg.rb
@@ -37,7 +37,7 @@ class Librsvg < Autotools
   depends_on 'py3_smartypants' => :build
   depends_on 'rust' => :build
   depends_on 'vala' => :build
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   gnome
 
diff --git a/packages/librsync.rb b/packages/librsync.rb
index 52264940f..89a54cb7d 100644
--- a/packages/librsync.rb
+++ b/packages/librsync.rb
@@ -22,7 +22,7 @@ class Librsync < Package
   depends_on 'bzip2'
   depends_on 'perl'
   depends_on 'popt'
-  depends_on 'zlibpkg'
+  depends_on 'zlib'
 
   def self.build
     system "cmake -G Ninja . #{CREW_CMAKE_OPTIONS}"
diff --git a/packages/libsoup.rb b/packages/libsoup.rb
index ebb728477..21a45ffad 100644
--- a/packages/libsoup.rb
+++ b/packages/libsoup.rb
@@ -31,7 +31,7 @@ class Libsoup < Meson
   depends_on 'py3_smartypants' => :build
   depends_on 'sqlite' # R
   depends_on 'vala' => :build
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   gnome
 
diff --git a/packages/libsoup2.rb b/packages/libsoup2.rb
index 5aeed842a..ecc0fc9c2 100644
--- a/packages/libsoup2.rb
+++ b/packages/libsoup2.rb
@@ -27,7 +27,7 @@ class Libsoup2 < Package
   # depends_on 'qt5_base' => :build
   depends_on 'sqlite' # R
   depends_on 'vala' => :build
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   gnome
 
diff --git a/packages/libssh.rb b/packages/libssh.rb
index d2ab4f0e9..8d260f099 100644
--- a/packages/libssh.rb
+++ b/packages/libssh.rb
@@ -21,7 +21,7 @@ class Libssh < CMake
   depends_on 'krb5'
   depends_on 'libgcrypt'
   depends_on 'py3_abimap' => :build
-  depends_on 'zlibpkg'
+  depends_on 'zlib'
   depends_on 'glibc' # R
   depends_on 'openssl' # R
 
diff --git a/packages/libssh2.rb b/packages/libssh2.rb
index 0f4b04b3b..7d6bafbc7 100644
--- a/packages/libssh2.rb
+++ b/packages/libssh2.rb
@@ -19,7 +19,7 @@ class Libssh2 < Autotools
 
   depends_on 'glibc' # R
   depends_on 'openssl' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   configure_options '--with-libz'
 end
diff --git a/packages/libtiff.rb b/packages/libtiff.rb
index 8aad2cbea..d9eba74b1 100644
--- a/packages/libtiff.rb
+++ b/packages/libtiff.rb
@@ -34,7 +34,7 @@ class Libtiff < Package
   depends_on 'mesa' => :build unless ARCH == 'i686'
   depends_on 'wget2' => :build
   depends_on 'xzutils' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
   depends_on 'zstd' # R
 
   gnome
diff --git a/packages/libunwind.rb b/packages/libunwind.rb
index e7825d27f..7d034add4 100644
--- a/packages/libunwind.rb
+++ b/packages/libunwind.rb
@@ -21,7 +21,7 @@ class Libunwind < Autotools
   depends_on 'gcc_lib' # R
   depends_on 'glibc' # R
   depends_on 'xzutils' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   configure_options '--enable-ptrace'
 end
diff --git a/packages/libvisio.rb b/packages/libvisio.rb
index a44209c43..8bb020d51 100644
--- a/packages/libvisio.rb
+++ b/packages/libvisio.rb
@@ -32,5 +32,5 @@ class Libvisio < Autotools
   depends_on 'libwpd' => :build
   depends_on 'libwpg' => :build
   depends_on 'libxml2' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 end
diff --git a/packages/libvncserver.rb b/packages/libvncserver.rb
index 197df178a..0aa35a2a3 100644
--- a/packages/libvncserver.rb
+++ b/packages/libvncserver.rb
@@ -26,7 +26,7 @@ class Libvncserver < Package
   depends_on 'libpng' # R
   depends_on 'lzo' # R
   depends_on 'openssl' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   def self.build
     system "mold -run cmake -B builddir #{CREW_CMAKE_OPTIONS} \
diff --git a/packages/libwebp.rb b/packages/libwebp.rb
index eee86070b..a452c73c9 100644
--- a/packages/libwebp.rb
+++ b/packages/libwebp.rb
@@ -35,7 +35,7 @@ class Libwebp < Package
   depends_on 'libxi' # R
   depends_on 'libxmu' # R
   depends_on 'xzutils' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
   depends_on 'zstd' # R
 
   gnome
diff --git a/packages/libwmf.rb b/packages/libwmf.rb
index 44c4d77d5..cf3b3edf7 100644
--- a/packages/libwmf.rb
+++ b/packages/libwmf.rb
@@ -31,7 +31,7 @@ class Libwmf < Autotools
   depends_on 'libxcb' # R
   depends_on 'libxdmcp' # R
   depends_on 'xwayland' => :build
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   gnome
 
diff --git a/packages/libwpd.rb b/packages/libwpd.rb
index b54002161..f74b2e3aa 100644
--- a/packages/libwpd.rb
+++ b/packages/libwpd.rb
@@ -24,7 +24,7 @@ class Libwpd < Package
   depends_on 'gcc_lib' # R
   depends_on 'glibc' # R
   depends_on 'librevenge' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   def self.patch
     downloader 'https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/libwpd/trunk/libwpd-gcc11.patch',
diff --git a/packages/libwpg.rb b/packages/libwpg.rb
index 9ca0799c6..368e98085 100644
--- a/packages/libwpg.rb
+++ b/packages/libwpg.rb
@@ -26,7 +26,7 @@ class Libwpg < Package
   depends_on 'librevenge' # R
   depends_on 'libwpd' # R
   depends_on 'perl' => :build
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   def self.build
     system "./configure #{CREW_OPTIONS}"
diff --git a/packages/libxml2.rb b/packages/libxml2.rb
index 54d920667..4cc1548c0 100644
--- a/packages/libxml2.rb
+++ b/packages/libxml2.rb
@@ -22,7 +22,7 @@ class Libxml2 < CMake
   depends_on 'icu4c' # R
   depends_on 'ncurses' # R
   depends_on 'readline' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   gnome
 
diff --git a/packages/links.rb b/packages/links.rb
index 7903ee0ed..2f373774d 100644
--- a/packages/links.rb
+++ b/packages/links.rb
@@ -26,7 +26,7 @@ class Links < Package
   depends_on 'lzma'
   depends_on 'openssl'
   depends_on 'xzutils' # R
-  depends_on 'zlibpkg'
+  depends_on 'zlib'
   depends_on 'zstd' # R
 
   def self.build
diff --git a/packages/llvm16_build.rb b/packages/llvm16_build.rb
index ed7508440..ab0ff22b0 100644
--- a/packages/llvm16_build.rb
+++ b/packages/llvm16_build.rb
@@ -29,7 +29,7 @@ class Llvm16_build < Package
   depends_on 'ncurses' # R
   depends_on 'py3_pyyaml' => :build
   depends_on 'xzutils' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
   depends_on 'zstd' # R
 
   no_env_options
diff --git a/packages/llvm16_dev.rb b/packages/llvm16_dev.rb
index c360df2e1..f93569e27 100644
--- a/packages/llvm16_dev.rb
+++ b/packages/llvm16_dev.rb
@@ -29,7 +29,7 @@ class Llvm16_dev < Package
   depends_on 'llvm16_lib' # R
   depends_on 'ncurses' # R
   depends_on 'xzutils' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
   depends_on 'zstd' # R
 
   def self.install
diff --git a/packages/llvm16_lib.rb b/packages/llvm16_lib.rb
index a29a91de2..e5cd5ab26 100644
--- a/packages/llvm16_lib.rb
+++ b/packages/llvm16_lib.rb
@@ -26,7 +26,7 @@ class Llvm16_lib < Package
   depends_on 'libxml2' # R
   depends_on 'llvm16_build' => :build
   depends_on 'ncurses' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
   depends_on 'zstd' # R
 
   def self.install
diff --git a/packages/llvm17_build.rb b/packages/llvm17_build.rb
index 37a3da81b..7558d0462 100644
--- a/packages/llvm17_build.rb
+++ b/packages/llvm17_build.rb
@@ -30,7 +30,7 @@ class Llvm17_build < Package
   depends_on 'py3_pygments' => :build
   depends_on 'py3_pyyaml' => :build
   depends_on 'xzutils' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
   depends_on 'zstd' # R
 
   no_env_options
diff --git a/packages/llvm17_dev.rb b/packages/llvm17_dev.rb
index 11331dc7d..0bfcb298e 100644
--- a/packages/llvm17_dev.rb
+++ b/packages/llvm17_dev.rb
@@ -29,7 +29,7 @@ class Llvm17_dev < Package
   depends_on 'llvm17_lib' # R
   depends_on 'ncurses' # R
   depends_on 'xzutils' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
   depends_on 'zstd' # R
 
   no_shrink
diff --git a/packages/llvm17_lib.rb b/packages/llvm17_lib.rb
index 239801f14..e7704053d 100644
--- a/packages/llvm17_lib.rb
+++ b/packages/llvm17_lib.rb
@@ -26,7 +26,7 @@ class Llvm17_lib < Package
   depends_on 'libxml2' # R
   depends_on 'llvm17_build' => :build
   depends_on 'ncurses' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
   depends_on 'zstd' # R
 
   no_shrink
diff --git a/packages/llvm18_build.rb b/packages/llvm18_build.rb
index 435beb060..44d63a1a0 100644
--- a/packages/llvm18_build.rb
+++ b/packages/llvm18_build.rb
@@ -31,7 +31,7 @@ class Llvm18_build < Package
   depends_on 'py3_pygments' => :build
   depends_on 'py3_pyyaml' => :build
   depends_on 'xzutils' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
   depends_on 'zstd' # R
 
   no_env_options
diff --git a/packages/llvm18_dev.rb b/packages/llvm18_dev.rb
index 5b6d11ddb..109830c1d 100644
--- a/packages/llvm18_dev.rb
+++ b/packages/llvm18_dev.rb
@@ -29,7 +29,7 @@ class Llvm18_dev < Package
   depends_on 'llvm18_lib' # R
   depends_on 'ncurses' # R
   depends_on 'xzutils' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
   depends_on 'zstd' # R
 
   no_shrink
diff --git a/packages/llvm18_lib.rb b/packages/llvm18_lib.rb
index 2f72e0775..83e2a2807 100644
--- a/packages/llvm18_lib.rb
+++ b/packages/llvm18_lib.rb
@@ -26,7 +26,7 @@ class Llvm18_lib < Package
   depends_on 'libxml2' # R
   depends_on 'llvm18_build' => :build
   depends_on 'ncurses' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
   depends_on 'zstd' # R
 
   no_shrink
diff --git a/packages/lnav.rb b/packages/lnav.rb
index b709805b3..dbeee1c3d 100644
--- a/packages/lnav.rb
+++ b/packages/lnav.rb
@@ -19,7 +19,7 @@ class Lnav < Autotools
   depends_on 'sqlite' # R
   depends_on 'ncurses' # R
   depends_on 'readline' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
   depends_on 'bzip2' # R
   depends_on 'libcurl' # R
   depends_on 'libarchive' # R
diff --git a/packages/lshw.rb b/packages/lshw.rb
index 8e903c0c1..3b917950b 100644
--- a/packages/lshw.rb
+++ b/packages/lshw.rb
@@ -25,7 +25,7 @@ class Lshw < Package
   depends_on 'glib' # R
   depends_on 'gtk3' # R (but not needed for the CLI app)
   depends_on 'sqlite' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   def self.build; end
 
diff --git a/packages/man_db.rb b/packages/man_db.rb
index 0c60c7a7c..d360d60f6 100644
--- a/packages/man_db.rb
+++ b/packages/man_db.rb
@@ -24,7 +24,7 @@ class Man_db < Package
   depends_on 'groff' # L
   depends_on 'libpipeline' # R
   depends_on 'libseccomp' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   def self.patch
     system "for f in $(grep -lr '/usr/local' | xargs); do sed -i 's,/usr/local,#{CREW_PREFIX},g' $f; done"
diff --git a/packages/mapserver.rb b/packages/mapserver.rb
index 3ab9bc3f6..656a1e6b8 100644
--- a/packages/mapserver.rb
+++ b/packages/mapserver.rb
@@ -32,7 +32,7 @@ class Mapserver < Package
   depends_on 'libpng' # R
   depends_on 'libxml2' # R
   depends_on 'protobuf_c' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   def self.build
     Dir.mkdir 'builddir'
diff --git a/packages/mate_desktop.rb b/packages/mate_desktop.rb
index db7c7dc5f..e6f80ea7f 100644
--- a/packages/mate_desktop.rb
+++ b/packages/mate_desktop.rb
@@ -34,5 +34,5 @@ class Mate_desktop < Autotools
   depends_on 'libxrender' # R
   depends_on 'mate_common' => :build
   depends_on 'pango' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 end
diff --git a/packages/mesa.rb b/packages/mesa.rb
index 140ef2dc1..0fbb77c06 100644
--- a/packages/mesa.rb
+++ b/packages/mesa.rb
@@ -56,7 +56,7 @@ class Mesa < Meson
   depends_on 'wayland_protocols' => :build
   depends_on 'wayland' # R
   depends_on 'xcb_util_keysyms' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
   depends_on 'zstd' # R
 
   meson_options "#{CREW_MESON_OPTIONS.gsub('-mfpu=vfpv3-d16', '-mfpu=neon-fp16')} \
diff --git a/packages/minizip.rb b/packages/minizip.rb
index 463471349..fc67dd582 100644
--- a/packages/minizip.rb
+++ b/packages/minizip.rb
@@ -1,16 +1,16 @@
 require 'package'
-Package.load_package("#{__dir__}/zlibpkg.rb")
+Package.load_package("#{__dir__}/zlib.rb")
 
 class Minizip < Package
   description 'Minizip is a simple package to zip/unzip files, from zlib.'
-  homepage Zlibpkg.homepage
+  homepage Zlib.homepage
   version '1.3.1'
-  # When upgrading minizip, be sure to upgrade zlibpkg in tandem.
-  puts "#{self} version differs from Zlibpkg version #{Zlibpkg.version}".orange if version != Zlibpkg.version
-  license Zlibpkg.license
+  # When upgrading minizip, be sure to upgrade zlib in tandem.
+  puts "#{self} version differs from Zlib version #{Zlib.version}".orange if version != Zlib.version
+  license Zlib.license
   compatibility 'all'
-  source_url Zlibpkg.source_url
-  source_sha256 Zlibpkg.source_sha256
+  source_url Zlib.source_url
+  source_sha256 Zlib.source_sha256
   binary_compression 'tar.zst'
 
   binary_sha256({
@@ -20,7 +20,7 @@ class Minizip < Package
      x86_64: 'fbdfaeb7561751925637c326da3e6a008cb65ce4918aff2151596d52058fa614'
   })
 
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   def self.build
     Dir.chdir 'contrib/minizip' do
diff --git a/packages/mjpegtools.rb b/packages/mjpegtools.rb
index bcf4d6701..a2b2c6cab 100644
--- a/packages/mjpegtools.rb
+++ b/packages/mjpegtools.rb
@@ -39,7 +39,7 @@ class Mjpegtools < Package
   depends_on 'libxcb' # R
   depends_on 'libxdmcp' # R
   depends_on 'pango' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   def self.build
     system '[ -x configure ] || ./autogen.sh'
diff --git a/packages/mold.rb b/packages/mold.rb
index 65a44eaf7..a0a99ea8d 100644
--- a/packages/mold.rb
+++ b/packages/mold.rb
@@ -24,7 +24,7 @@ class Mold < CMake
   depends_on 'glibc' # R
   depends_on 'openssl' # R
   depends_on 'xxhash' => :build
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
   depends_on 'zstd' # R
 
   no_env_options
diff --git a/packages/motif.rb b/packages/motif.rb
index 19c472fa3..ce9164e64 100644
--- a/packages/motif.rb
+++ b/packages/motif.rb
@@ -38,7 +38,7 @@ class Motif < Package
   depends_on 'libxrender' # R
   depends_on 'libxt' # R
   depends_on 'util_linux' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   def self.build
     system "./configure #{CREW_OPTIONS} \
diff --git a/packages/mpv.rb b/packages/mpv.rb
index cef65e83d..87b099c8e 100644
--- a/packages/mpv.rb
+++ b/packages/mpv.rb
@@ -66,7 +66,7 @@ class Mpv < Meson
   depends_on 'wayland' # R
   depends_on 'xdg_base' # L
   depends_on 'zimg' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   def self.build
     # Wayland is disabled because mpv has moved to
diff --git a/packages/musl_native_toolchain.rb b/packages/musl_native_toolchain.rb
index 91c92b92e..d9c45a46f 100644
--- a/packages/musl_native_toolchain.rb
+++ b/packages/musl_native_toolchain.rb
@@ -21,7 +21,7 @@ class Musl_native_toolchain < Package
 
   # These libraries need to be built with the same version of gcc
   # as being built below, as the LTO versions need to match.
-  depends_on 'zlibpkg' => :build
+  depends_on 'zlib' => :build
   depends_on 'zstd' => :build
 
   is_musl
diff --git a/packages/mysql.rb b/packages/mysql.rb
index 97a0f6d97..da536020b 100644
--- a/packages/mysql.rb
+++ b/packages/mysql.rb
@@ -24,7 +24,7 @@ class Mysql < CMake
   depends_on 'protobuf'
   depends_on 'rapidjson'
   depends_on 'rpcsvc_proto'
-  depends_on 'zlibpkg'
+  depends_on 'zlib'
   depends_on 'zstd'
   depends_on 'gcc_lib' # R
   depends_on 'glibc_lib' # R
diff --git a/packages/nano.rb b/packages/nano.rb
index 34fd2beff..338f1b2e2 100644
--- a/packages/nano.rb
+++ b/packages/nano.rb
@@ -20,7 +20,7 @@ class Nano < Package
   depends_on 'filecmd' # R
   depends_on 'glibc' # R
   depends_on 'ncurses' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   def self.build
     system "mold -run \
diff --git a/packages/ncdc.rb b/packages/ncdc.rb
index 1939b7c30..c1f5a7061 100644
--- a/packages/ncdc.rb
+++ b/packages/ncdc.rb
@@ -18,7 +18,7 @@ class Ncdc < Package
   })
 
   depends_on 'ncurses'
-  depends_on 'zlibpkg'
+  depends_on 'zlib'
   depends_on 'bzip2'
   depends_on 'sqlite'
   depends_on 'glib'
diff --git a/packages/neon.rb b/packages/neon.rb
index 21403eb56..7c98fc43d 100644
--- a/packages/neon.rb
+++ b/packages/neon.rb
@@ -22,7 +22,7 @@ class Neon < Package
   depends_on 'krb5' # R
   depends_on 'libproxy' # R
   depends_on 'openssl' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   def self.build
     system './autogen.sh'
diff --git a/packages/nss.rb b/packages/nss.rb
index 5a211bf6b..5221b3a83 100644
--- a/packages/nss.rb
+++ b/packages/nss.rb
@@ -23,7 +23,7 @@ class Nss < Package
   depends_on 'glibc' # R
   depends_on 'gyp_next' => :build
   depends_on 'sqlite' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   def self.build
     @build_64 = ARCH == 'x86_64' ? '1' : '0'
diff --git a/packages/octave.rb b/packages/octave.rb
index 1aaa4c7bd..151b67c0e 100644
--- a/packages/octave.rb
+++ b/packages/octave.rb
@@ -34,6 +34,6 @@ class Octave < Autotools
   depends_on 'openblas' => :build
   depends_on 'pcre2' # R
   depends_on 'readline' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
   depends_on 'openblas' # R
 end
diff --git a/packages/openimageio.rb b/packages/openimageio.rb
index 723a549b2..177bbca8b 100644
--- a/packages/openimageio.rb
+++ b/packages/openimageio.rb
@@ -28,7 +28,7 @@ class Openimageio < CMake
   depends_on 'openexr'
   depends_on 'pugixml'
   depends_on 'py3_pybind11'
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   # The setup for finding pybind11 is custom, so it's hard to tell where exactly it breaks to fix it properly.
   cmake_options "-Dpybind11_ROOT=#{CREW_PREFIX}/lib/python#{version.split('y').last}/site-packages/pybind11 -DOIIO_BUILD_TESTS=OFF"
diff --git a/packages/openjpeg.rb b/packages/openjpeg.rb
index 198debaff..2da9ca1bb 100644
--- a/packages/openjpeg.rb
+++ b/packages/openjpeg.rb
@@ -24,7 +24,7 @@ class Openjpeg < CMake
   depends_on 'libtiff' # R
   depends_on 'libwebp' # R
   depends_on 'xzutils' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
   depends_on 'zstd' # R
 
   cmake_options "-DOPENJPEG_INSTALL_LIB_DIR='lib#{CREW_LIB_SUFFIX}'"
diff --git a/packages/openssh.rb b/packages/openssh.rb
index e3387b371..8640bdb57 100644
--- a/packages/openssh.rb
+++ b/packages/openssh.rb
@@ -21,7 +21,7 @@ class Openssh < Autotools
   depends_on 'glibc' # R
   depends_on 'libmd' # R
   depends_on 'openssl' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   configure_options '--enable-year2038 --without-hardening --without-retpoline'
 end
diff --git a/packages/pcre2.rb b/packages/pcre2.rb
index 53b8da48b..a0075df50 100644
--- a/packages/pcre2.rb
+++ b/packages/pcre2.rb
@@ -20,7 +20,7 @@ class Pcre2 < Package
   depends_on 'glibc' # R
   depends_on 'readline' # R
   depends_on 'bzip2' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   def self.build
     system "cmake -B builddir\
diff --git a/packages/perl_net_ssleay.rb b/packages/perl_net_ssleay.rb
index 962774b09..07ba0206d 100644
--- a/packages/perl_net_ssleay.rb
+++ b/packages/perl_net_ssleay.rb
@@ -19,5 +19,5 @@ class Perl_net_ssleay < PERL
 
   depends_on 'glibc' # R
   depends_on 'openssl' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 end
diff --git a/packages/php74.rb b/packages/php74.rb
index 5092303b1..9415fa171 100644
--- a/packages/php74.rb
+++ b/packages/php74.rb
@@ -61,7 +61,7 @@ class Php74 < Package
   depends_on 'sqlite' # R
   depends_on 'tidy'
   depends_on 'unixodbc'
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
   depends_on 'zstd' # R
 
   no_fhs
diff --git a/packages/php80.rb b/packages/php80.rb
index 1a28eb423..4916e283a 100644
--- a/packages/php80.rb
+++ b/packages/php80.rb
@@ -61,7 +61,7 @@ class Php80 < Package
   depends_on 'sqlite' # R
   depends_on 'tidy'
   depends_on 'unixodbc'
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
   depends_on 'zstd' # R
 
   no_fhs
diff --git a/packages/php81.rb b/packages/php81.rb
index 36c7cc126..988032c48 100644
--- a/packages/php81.rb
+++ b/packages/php81.rb
@@ -61,7 +61,7 @@ class Php81 < Package
   depends_on 'sqlite' # R
   depends_on 'tidy' # R
   depends_on 'unixodbc' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
   depends_on 'zstd' # R
 
   no_fhs
diff --git a/packages/php82.rb b/packages/php82.rb
index 1e1dcbfc0..0bf0572be 100644
--- a/packages/php82.rb
+++ b/packages/php82.rb
@@ -61,7 +61,7 @@ class Php82 < Package
   depends_on 'sqlite' # R
   depends_on 'tidy' # R
   depends_on 'unixodbc' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
   depends_on 'zstd' # R
 
   no_fhs
diff --git a/packages/php83.rb b/packages/php83.rb
index 709236cd6..4e74461f1 100644
--- a/packages/php83.rb
+++ b/packages/php83.rb
@@ -61,7 +61,7 @@ class Php83 < Package
   depends_on 'sqlite' # R
   depends_on 'tidy' # R
   depends_on 'unixodbc' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
   depends_on 'zstd' # R
 
   no_fhs
diff --git a/packages/podofo.rb b/packages/podofo.rb
index ffbe834c5..35249147d 100644
--- a/packages/podofo.rb
+++ b/packages/podofo.rb
@@ -24,7 +24,7 @@ class Podofo < Package
   depends_on 'libtiff'
   depends_on 'libxml2'
   depends_on 'openssl'
-  depends_on 'zlibpkg'
+  depends_on 'zlib'
 
   def self.build
     system "cmake -G 'Unix Makefiles' \
diff --git a/packages/poppler.rb b/packages/poppler.rb
index bd0cddfd5..56553e289 100644
--- a/packages/poppler.rb
+++ b/packages/poppler.rb
@@ -34,7 +34,7 @@ class Poppler < Package
   depends_on 'openjpeg' # R
   depends_on 'poppler_data' => :build
   depends_on 'qt5_base' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   def self.build
     system "mold -run cmake -B builddir #{CREW_CMAKE_OPTIONS} \
diff --git a/packages/postgresql.rb b/packages/postgresql.rb
index f2981084a..175b352d5 100644
--- a/packages/postgresql.rb
+++ b/packages/postgresql.rb
@@ -34,7 +34,7 @@ class Postgresql < Package
   depends_on 'python3' # R
   depends_on 'readline' # R
   depends_on 'tcl' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
   depends_on 'zstd' # R
 
   print_source_bashrc
diff --git a/packages/potrace.rb b/packages/potrace.rb
index 7dd44afdc..7f59a8f65 100644
--- a/packages/potrace.rb
+++ b/packages/potrace.rb
@@ -18,7 +18,7 @@ class Potrace < Package
   })
 
   depends_on 'glibc' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   def self.build
     system "./configure #{CREW_OPTIONS} --with-libpotrace"
diff --git a/packages/protobuf.rb b/packages/protobuf.rb
index 7b2ee610a..fe704181b 100644
--- a/packages/protobuf.rb
+++ b/packages/protobuf.rb
@@ -22,7 +22,7 @@ class Protobuf < Package
 
   depends_on 'gcc_lib' # R
   depends_on 'glibc' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   def self.build
     FileUtils.mkdir('builddir')
diff --git a/packages/putty.rb b/packages/putty.rb
index e57ed8dc1..2c2dbf1ae 100644
--- a/packages/putty.rb
+++ b/packages/putty.rb
@@ -28,5 +28,5 @@ class Putty < CMake
   depends_on 'libx11' # R
   depends_on 'libxext' # R
   depends_on 'pango' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 end
diff --git a/packages/py3_libxml2.rb b/packages/py3_libxml2.rb
index 6bd820f88..404505205 100644
--- a/packages/py3_libxml2.rb
+++ b/packages/py3_libxml2.rb
@@ -23,7 +23,7 @@ class Py3_libxml2 < Package
   depends_on 'libxslt' => :build
   depends_on 'py3_setuptools' => :build
   depends_on 'python3' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   def self.build
     system 'autoreconf -fiv'
diff --git a/packages/py3_lxml.rb b/packages/py3_lxml.rb
index 3faa6b7a7..a003cfaab 100644
--- a/packages/py3_lxml.rb
+++ b/packages/py3_lxml.rb
@@ -22,6 +22,6 @@ class Py3_lxml < Pip
   depends_on 'libxslt' # R
   depends_on 'py3_cython' => :build
   depends_on 'python3' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
   no_source_build
 end
diff --git a/packages/py3_numpy.rb b/packages/py3_numpy.rb
index cf36eaa75..d84a0e9ed 100644
--- a/packages/py3_numpy.rb
+++ b/packages/py3_numpy.rb
@@ -24,7 +24,7 @@ class Py3_numpy < Pip
   depends_on 'py3_cython' => :build
   depends_on 'py3_setuptools' => :build
   depends_on 'python3' => :build
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   pre_configure_options CREW_ENV_OPTIONS.gsub('mold', 'gold')
 end
diff --git a/packages/py3_pillow.rb b/packages/py3_pillow.rb
index 828ed7ed3..4e48b011f 100644
--- a/packages/py3_pillow.rb
+++ b/packages/py3_pillow.rb
@@ -20,7 +20,7 @@ class Py3_pillow < Pip
   depends_on 'py3_lxml'
   depends_on 'py3_xlsxwriter'
   depends_on 'python3' => :build
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   no_compile_needed
 end
diff --git a/packages/python2.rb b/packages/python2.rb
index e8d2edda9..38931419c 100644
--- a/packages/python2.rb
+++ b/packages/python2.rb
@@ -26,7 +26,7 @@ class Python2 < Package
   depends_on 'openssl' # R
   depends_on 'readline' # R
   depends_on 'sqlite' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   #  def self.patch
   #    system "sed -i -e 's:#{CREW_LIB_PREFIX}:$(get_libdir):g' \
diff --git a/packages/python3.rb b/packages/python3.rb
index 4328492ea..92c583d44 100644
--- a/packages/python3.rb
+++ b/packages/python3.rb
@@ -37,7 +37,7 @@ class Python3 < Package
   depends_on 'tk' => :build unless ARCH == 'i686' # Needed for tkinter support
   depends_on 'util_linux' # R
   depends_on 'xzutils' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
   depends_on 'zoneinfo' # L
 
   no_env_options
diff --git a/packages/qbittorrent.rb b/packages/qbittorrent.rb
index f6391e496..79ba518cd 100644
--- a/packages/qbittorrent.rb
+++ b/packages/qbittorrent.rb
@@ -24,5 +24,5 @@ class Qbittorrent < CMake
   depends_on 'qt5_base' # R
   depends_on 'qt5_svg' => :build
   depends_on 'qt5_tools' => :build
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 end
diff --git a/packages/qemu.rb b/packages/qemu.rb
index 6b58627b3..2ea8c9412 100644
--- a/packages/qemu.rb
+++ b/packages/qemu.rb
@@ -64,7 +64,7 @@ class Qemu < Package
   depends_on 'snappy' # R
   depends_on 'sphinx' => :build
   depends_on 'vte' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
   depends_on 'zstd' # R
 
   def self.patch
diff --git a/packages/qpdf.rb b/packages/qpdf.rb
index 4ec6978ea..b91d56fb2 100644
--- a/packages/qpdf.rb
+++ b/packages/qpdf.rb
@@ -22,7 +22,7 @@ class Qpdf < Package
   depends_on 'glibc' # R
   depends_on 'gnutls' # R
   depends_on 'openssl' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   def self.build
     Dir.mkdir 'builddir'
diff --git a/packages/qt5_base.rb b/packages/qt5_base.rb
index 555231f9d..721b3e6b3 100644
--- a/packages/qt5_base.rb
+++ b/packages/qt5_base.rb
@@ -65,7 +65,7 @@ class Qt5_base < Package
   depends_on 'xcb_util_renderutil' # R
   depends_on 'xcb_util_wm' # R
   depends_on 'xcb_util_xrm' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
   depends_on 'zstd' # R
 
   def self.build
diff --git a/packages/qt5_location.rb b/packages/qt5_location.rb
index 17869e1b5..e9d9f2de5 100644
--- a/packages/qt5_location.rb
+++ b/packages/qt5_location.rb
@@ -22,5 +22,5 @@ class Qt5_location < Qmake
   depends_on 'libglvnd' # R
   depends_on 'qt5_base' # R
   depends_on 'qt5_declarative' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 end
diff --git a/packages/qt5_svg.rb b/packages/qt5_svg.rb
index 1f48fe617..2ab4cd72c 100644
--- a/packages/qt5_svg.rb
+++ b/packages/qt5_svg.rb
@@ -20,5 +20,5 @@ class Qt5_svg < Qmake
   depends_on 'glibc' # R
   depends_on 'libglvnd' # R
   depends_on 'qt5_base' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 end
diff --git a/packages/qt5_wayland.rb b/packages/qt5_wayland.rb
index e67bb4f8f..4ec18cad4 100644
--- a/packages/qt5_wayland.rb
+++ b/packages/qt5_wayland.rb
@@ -31,5 +31,5 @@ class Qt5_wayland < Qmake
   depends_on 'qt5_base' # R
   depends_on 'qt5_declarative' # R
   depends_on 'wayland' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 end
diff --git a/packages/qt5_webengine.rb b/packages/qt5_webengine.rb
index 05c88a53c..9f7c72f69 100644
--- a/packages/qt5_webengine.rb
+++ b/packages/qt5_webengine.rb
@@ -72,7 +72,7 @@ class Qt5_webengine < Package
   depends_on 'qt5_webchannel' # R
   depends_on 're2' # R
   depends_on 'snappy' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   def self.patch
     # Patches from lfs: https://www.linuxfromscratch.org/blfs/view/svn/x/qtwebengine.html
diff --git a/packages/qt5_webglplugin.rb b/packages/qt5_webglplugin.rb
index b492ac604..88418590d 100644
--- a/packages/qt5_webglplugin.rb
+++ b/packages/qt5_webglplugin.rb
@@ -26,5 +26,5 @@ class Qt5_webglplugin < Qmake
   depends_on 'qt5_base' # R
   depends_on 'qt5_declarative' # R
   depends_on 'qt5_websockets' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 end
diff --git a/packages/r.rb b/packages/r.rb
index ca0d57878..68fe7e08b 100644
--- a/packages/r.rb
+++ b/packages/r.rb
@@ -39,7 +39,7 @@ class R < Autotools
   depends_on 'tk' # R
   depends_on 'xdg_utils' => :build
   depends_on 'xzutils' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   configure_options '--enable-R-shlib \
            --with-x'
diff --git a/packages/rtmpdump.rb b/packages/rtmpdump.rb
index 319baeece..daff317fe 100644
--- a/packages/rtmpdump.rb
+++ b/packages/rtmpdump.rb
@@ -21,7 +21,7 @@ class Rtmpdump < Package
   depends_on 'gmp' # R
   depends_on 'gnutls' # R
   depends_on 'nettle' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   @make_common_opts = ['SYS=posix', "prefix=#{CREW_PREFIX}", "libdir=#{CREW_LIB_PREFIX}",
                        "mandir=#{CREW_PREFIX}/share/man", 'CRYPTO=GNUTLS']
diff --git a/packages/ruby.rb b/packages/ruby.rb
index 86e0938e3..b03890c0b 100644
--- a/packages/ruby.rb
+++ b/packages/ruby.rb
@@ -26,11 +26,11 @@ class Ruby < Package
   depends_on 'libyaml' # R
   depends_on 'openssl' # R
   depends_on 'rust' => :build
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   conflicts_ok # Needed for successful build.
 
-  # at run-time, system's gmp, openssl, and zlibpkg can be used
+  # at run-time, system's gmp, openssl, and zlib can be used
 
   def self.build
     system '[ -x configure ] || autoreconf -fiv'
diff --git a/packages/rust.rb b/packages/rust.rb
index b1704b310..a48059488 100644
--- a/packages/rust.rb
+++ b/packages/rust.rb
@@ -19,7 +19,7 @@ class Rust < Package
 
   depends_on 'gcc_lib' # R
   depends_on 'glibc' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   no_strip
   no_shrink
diff --git a/packages/shotcut.rb b/packages/shotcut.rb
index 9c3a24193..1e1e37144 100644
--- a/packages/shotcut.rb
+++ b/packages/shotcut.rb
@@ -92,7 +92,7 @@ class Shotcut < Package
   depends_on 'xcb_util' # R
   depends_on 'xzutils' # R
   depends_on 'zimg' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
   depends_on 'zstd' # R
 
   def self.build
diff --git a/packages/slang.rb b/packages/slang.rb
index eb3b10ce7..afc1711d4 100644
--- a/packages/slang.rb
+++ b/packages/slang.rb
@@ -20,7 +20,7 @@ class Slang < Package
   depends_on 'glibc' # R
   depends_on 'libpng' # R
   depends_on 'pcre' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
   depends_on 'gcc_lib' # R
 
   def self.build
diff --git a/packages/smbclient.rb b/packages/smbclient.rb
index 6f4b5a4ef..d93aaf5f5 100644
--- a/packages/smbclient.rb
+++ b/packages/smbclient.rb
@@ -48,7 +48,7 @@ class Smbclient < Package
   depends_on 'talloc' # R
   depends_on 'tdb' # R
   depends_on 'tevent' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   @samba4_idmap_modules = 'idmap_ad,idmap_rid,idmap_adex,idmap_hash,idmap_tdb2'
   @samba4_pdb_modules = 'pdb_tdbsam,pdb_ldap,pdb_ads,pdb_smbpasswd,pdb_wbc_sam,pdb_samba4'
diff --git a/packages/spacefm.rb b/packages/spacefm.rb
index d68085ca5..ab70bd061 100644
--- a/packages/spacefm.rb
+++ b/packages/spacefm.rb
@@ -31,7 +31,7 @@ class Spacefm < Package
   depends_on 'libx11' # R
   depends_on 'pango' # R
   depends_on 'shared_mime_info' => :build
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   def self.patch
     # GCC 10.1+ Fixes
diff --git a/packages/spice_gtk.rb b/packages/spice_gtk.rb
index b8084172e..d942d4659 100644
--- a/packages/spice_gtk.rb
+++ b/packages/spice_gtk.rb
@@ -45,7 +45,7 @@ class Spice_gtk < Package
   depends_on 'openssl' # R
   depends_on 'pixman' # R
   depends_on 'wayland' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   def self.build
     system "meson \
diff --git a/packages/sqlite.rb b/packages/sqlite.rb
index e94bd83ac..69f7065d6 100644
--- a/packages/sqlite.rb
+++ b/packages/sqlite.rb
@@ -20,7 +20,7 @@ class Sqlite < Autotools
   depends_on 'glibc' # R
   depends_on 'libedit' # R
   depends_on 'readline' => :build
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
   depends_on 'ncurses' # R
 
   configure_options '--enable-shared \
diff --git a/packages/squashfs.rb b/packages/squashfs.rb
index 192ce3614..43f39dcfc 100644
--- a/packages/squashfs.rb
+++ b/packages/squashfs.rb
@@ -24,7 +24,7 @@ class Squashfs < Package
   depends_on 'lz4' # R
   depends_on 'lzo' # R
   depends_on 'xzutils' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
   depends_on 'zstd' # R
 
   def self.patch
diff --git a/packages/swi_prolog.rb b/packages/swi_prolog.rb
index 5d9b84ef8..4d1d9c74a 100644
--- a/packages/swi_prolog.rb
+++ b/packages/swi_prolog.rb
@@ -27,7 +27,7 @@ class Swi_prolog < CMake
   depends_on 'pcre2' # R
   depends_on 'python3' # R
   depends_on 'readline' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   pre_cmake_options "CFLAGS+=' -I#{CREW_PREFIX}/include/ncurses'"
   cmake_options '-DCMAKE_BUILD_TYPE=PGO'
diff --git a/packages/swig.rb b/packages/swig.rb
index 95d7e219d..2d62b5106 100644
--- a/packages/swig.rb
+++ b/packages/swig.rb
@@ -22,5 +22,5 @@ class Swig < Autotools
   depends_on 'glibc' # R
   depends_on 'pcre' => :build
   depends_on 'pcre2' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 end
diff --git a/packages/tcl.rb b/packages/tcl.rb
index 7388939c1..e8344a82a 100644
--- a/packages/tcl.rb
+++ b/packages/tcl.rb
@@ -18,7 +18,7 @@ class Tcl < Package
   })
 
   depends_on 'glibc' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   no_lto
 
diff --git a/packages/tcpflow.rb b/packages/tcpflow.rb
index 24be18b50..c67016635 100644
--- a/packages/tcpflow.rb
+++ b/packages/tcpflow.rb
@@ -32,7 +32,7 @@ class Tcpflow < Package
   depends_on 'openssl' # R
   depends_on 'pixman' # R
   depends_on 'sqlite' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   def self.build
     system 'bash bootstrap.sh'
diff --git a/packages/tesseract.rb b/packages/tesseract.rb
index e933c5a2c..4a5bf1ed1 100644
--- a/packages/tesseract.rb
+++ b/packages/tesseract.rb
@@ -56,7 +56,7 @@ class Tesseract < CMake
   depends_on 'openssl' => :build
   depends_on 'pango' # R
   depends_on 'xzutils' => :build
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
   depends_on 'zstd' => :build
 
   git_fetchtags
diff --git a/packages/testdisk.rb b/packages/testdisk.rb
index 85fa3311a..c1f132d5d 100644
--- a/packages/testdisk.rb
+++ b/packages/testdisk.rb
@@ -21,7 +21,7 @@ class Testdisk < Package
   depends_on 'compressdoc' => :build
   depends_on 'libjpeg_turbo'
   depends_on 'ncurses'
-  depends_on 'zlibpkg'
+  depends_on 'zlib'
   depends_on 'e2fsprogs' # R
   depends_on 'glibc' # R
   depends_on 'util_linux' # R
diff --git a/packages/tk.rb b/packages/tk.rb
index c569ac92d..872549372 100644
--- a/packages/tk.rb
+++ b/packages/tk.rb
@@ -24,7 +24,7 @@ class Tk < Package
   depends_on 'libxft' # R
   depends_on 'libxss' # R
   depends_on 'tcl' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   no_lto
 
diff --git a/packages/ugrep.rb b/packages/ugrep.rb
index 4161a47a8..fa84a4dab 100644
--- a/packages/ugrep.rb
+++ b/packages/ugrep.rb
@@ -19,6 +19,6 @@ class Ugrep < Autotools
   depends_on 'lz4'
   depends_on 'pcre2'
   depends_on 'xzutils'
-  depends_on 'zlibpkg'
+  depends_on 'zlib'
   depends_on 'zstd'
 end
diff --git a/packages/util_linux.rb b/packages/util_linux.rb
index 1e6c8829d..57d593e5e 100644
--- a/packages/util_linux.rb
+++ b/packages/util_linux.rb
@@ -33,7 +33,7 @@ class Util_linux < Meson
   depends_on 'ruby_asciidoctor' => :build
   depends_on 'sqlite' # R
   depends_on 'xzutils' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
   depends_on 'zstd' # R
 
   conflicts_ok
diff --git a/packages/vice.rb b/packages/vice.rb
index 6e7fba459..5e99e8442 100644
--- a/packages/vice.rb
+++ b/packages/vice.rb
@@ -29,7 +29,7 @@ class Vice < Autotools
   depends_on 'mpg123' # R
   depends_on 'pulseaudio' # R
   depends_on 'xdg_utils' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   configure_options '--enable-gtk3ui \
     --enable-desktop-files \
diff --git a/packages/vte.rb b/packages/vte.rb
index a23931336..6ec995f4b 100644
--- a/packages/vte.rb
+++ b/packages/vte.rb
@@ -35,7 +35,7 @@ class Vte < Meson
   depends_on 'pcre2' # R
   depends_on 'vulkan_headers' => :build
   depends_on 'vulkan_icd_loader' => :build
-  depends_on 'zlibpkg' => :build
+  depends_on 'zlib' => :build
 
   gnome
   no_lto
diff --git a/packages/wayland.rb b/packages/wayland.rb
index 5887bc9d3..9d2d46482 100644
--- a/packages/wayland.rb
+++ b/packages/wayland.rb
@@ -23,7 +23,7 @@ class Wayland < Meson
   depends_on 'icu4c' => :build
   depends_on 'libffi' # R
   depends_on 'libxml2' # R
-  depends_on 'zlibpkg' => :build
+  depends_on 'zlib' => :build
 
   meson_options '-Ddocumentation=false'
 
diff --git a/packages/webkit2gtk_4.rb b/packages/webkit2gtk_4.rb
index aa54c65a6..cef0b5ce3 100644
--- a/packages/webkit2gtk_4.rb
+++ b/packages/webkit2gtk_4.rb
@@ -72,7 +72,7 @@ class Webkit2gtk_4 < Package
   depends_on 'wayland' # R
   depends_on 'woff2' # R
   depends_on 'wpebackend_fdo' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   no_env_options
 
diff --git a/packages/webkit2gtk_4_1.rb b/packages/webkit2gtk_4_1.rb
index b81d25469..5d85602ef 100644
--- a/packages/webkit2gtk_4_1.rb
+++ b/packages/webkit2gtk_4_1.rb
@@ -72,7 +72,7 @@ class Webkit2gtk_4_1 < Package
   depends_on 'wayland' # R
   depends_on 'woff2' # R
   depends_on 'wpebackend_fdo' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   no_env_options
 
diff --git a/packages/webkitgtk_6.rb b/packages/webkitgtk_6.rb
index 6ab7abbe7..e19b0f9ed 100644
--- a/packages/webkitgtk_6.rb
+++ b/packages/webkitgtk_6.rb
@@ -74,7 +74,7 @@ class Webkitgtk_6 < Package
   depends_on 'wayland' # R
   depends_on 'woff2' # R
   depends_on 'wpebackend_fdo' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   no_env_options
 
diff --git a/packages/weston.rb b/packages/weston.rb
index c56991a5a..2c9383dfa 100644
--- a/packages/weston.rb
+++ b/packages/weston.rb
@@ -57,7 +57,7 @@ class Weston < Meson
   depends_on 'wayland' # R
   depends_on 'xcb_util_cursor' => :build
   depends_on 'xdg_base' => :build
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   meson_options "-Dbackend-default=wayland \
         -Dbackend-drm=true \
diff --git a/packages/wget2.rb b/packages/wget2.rb
index 5850a7dca..ddb05164d 100644
--- a/packages/wget2.rb
+++ b/packages/wget2.rb
@@ -31,7 +31,7 @@ class Wget2 < Autotools
   depends_on 'pcre2' # R
   depends_on 'util_linux' => :build
   depends_on 'xzutils' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
   depends_on 'zstd' # R
 
   configure_options '--enable-year2038 \
diff --git a/packages/wireshark.rb b/packages/wireshark.rb
index 0b76aec4f..240fa1ffd 100644
--- a/packages/wireshark.rb
+++ b/packages/wireshark.rb
@@ -51,7 +51,7 @@ class Wireshark < CMake
   depends_on 'sbc' # R
   depends_on 'snappy' # R
   depends_on 'speexdsp' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
   depends_on 'zstd' # R
 
   git_fetchtags
diff --git a/packages/wkhtmltox.rb b/packages/wkhtmltox.rb
index 00902f183..34d1586f0 100644
--- a/packages/wkhtmltox.rb
+++ b/packages/wkhtmltox.rb
@@ -18,7 +18,7 @@ class Wkhtmltox < Package
   depends_on 'libx11' # R
   depends_on 'libxext' # R
   depends_on 'libxrender' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   def self.install
     FileUtils.mkdir_p CREW_DEST_PREFIX
diff --git a/packages/wxwidgets.rb b/packages/wxwidgets.rb
index ab1c06899..67ddb43dc 100644
--- a/packages/wxwidgets.rb
+++ b/packages/wxwidgets.rb
@@ -56,7 +56,7 @@ class Wxwidgets < Package
   depends_on 'pcre2' # R
   depends_on 'wayland' # R
   depends_on 'webkit2gtk_4_1' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   def self.preflight
     %w[wxwidgets30 wxwidgets31].each do |wxw|
diff --git a/packages/wxwidgets30.rb b/packages/wxwidgets30.rb
index a238f3635..f4b377d96 100644
--- a/packages/wxwidgets30.rb
+++ b/packages/wxwidgets30.rb
@@ -41,7 +41,7 @@ class Wxwidgets30 < Package
   depends_on 'mesa' # R
   depends_on 'pango' # R
   depends_on 'webkit2gtk_4' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   def self.preflight
     %w[wxwidgets wxwidgets31].each do |wxw|
diff --git a/packages/wxwidgets31.rb b/packages/wxwidgets31.rb
index 1784aa59d..741aa5375 100644
--- a/packages/wxwidgets31.rb
+++ b/packages/wxwidgets31.rb
@@ -52,7 +52,7 @@ class Wxwidgets31 < Package
   depends_on 'pango' # R
   depends_on 'wayland' # R
   depends_on 'webkit2gtk_4' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   def self.preflight
     %w[wxwidgets wxwidgets30].each do |wxw|
diff --git a/packages/yelp.rb b/packages/yelp.rb
index cd86ccccb..b400b6cbd 100644
--- a/packages/yelp.rb
+++ b/packages/yelp.rb
@@ -40,7 +40,7 @@ class Yelp < Autotools
   depends_on 'xorg_server' => :build
   depends_on 'xzutils' # R
   depends_on 'yelp_xsl' => :build
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   gnome
 
diff --git a/packages/zlibpkg.rb b/packages/zlib.rb
similarity index 92%
rename from packages/zlibpkg.rb
rename to packages/zlib.rb
index 99cd51e0c..f2989069e 100644
--- a/packages/zlibpkg.rb
+++ b/packages/zlib.rb
@@ -1,10 +1,10 @@
 require 'buildsystems/cmake'
 
-class Zlibpkg < CMake
+class Zlib < CMake
   description 'zlib is a massively spiffy yet delicately unobtrusive compression library.'
-  homepage 'https://www.zlib.net/'
+  homepage 'https://zlib.net'
   version '1.3.1' # Do not use @_ver here, it will break the installer.
-  # When upgrading zlibpkg, be sure to upgrade minizip in tandem.
+  # When upgrading zlib, be sure to upgrade minizip in tandem.
   # The following breaks the installer script.
   # puts "#{self} version differs from Minizip version #{Minizip.version}".orange if @_ver != Minizip.version
   license 'zlib'
diff --git a/packages/zstd.rb b/packages/zstd.rb
index ec2256f07..f289511e1 100644
--- a/packages/zstd.rb
+++ b/packages/zstd.rb
@@ -19,7 +19,7 @@ class Zstd < Package
 
   depends_on 'gcc_lib' # R
   depends_on 'glibc' # R
-  depends_on 'zlibpkg' # R
+  depends_on 'zlib' # R
 
   no_zstd
 
diff --git a/tools/core_packages.txt b/tools/core_packages.txt
index fc3090a8b..ba3252808 100644
--- a/tools/core_packages.txt
+++ b/tools/core_packages.txt
@@ -161,6 +161,6 @@ xmlcatmgr
 xxhash
 xzutils
 zip
-zlibpkg
+zlib
 zoneinfo
 zstd