diff --git a/cddl/lib/libavl/Makefile b/cddl/lib/libavl/Makefile
--- a/cddl/lib/libavl/Makefile
+++ b/cddl/lib/libavl/Makefile
@@ -1,6 +1,8 @@
 .PATH: ${SRCTOP}/sys/contrib/openzfs/module/avl
 
-PACKAGE=	libzfs
+PACKAGE=	zfs
+LIB_PACKAGE=
+
 LIB=	avl
 LIBADD=	spl
 SRCS=	avl.c
diff --git a/cddl/lib/libicp/Makefile b/cddl/lib/libicp/Makefile
--- a/cddl/lib/libicp/Makefile
+++ b/cddl/lib/libicp/Makefile
@@ -1,6 +1,8 @@
 .PATH: ${SRCTOP}/sys/contrib/openzfs/module/icp
 
 PACKAGE=	zfs
+LIB_PACKAGE=
+
 LIB=	icp
 LIBADD=
 
diff --git a/cddl/lib/libnvpair/Makefile b/cddl/lib/libnvpair/Makefile
--- a/cddl/lib/libnvpair/Makefile
+++ b/cddl/lib/libnvpair/Makefile
@@ -2,10 +2,12 @@
 .PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libnvpair
 .PATH: ${SRCTOP}/sys/contrib/openzfs/include
 
+PACKAGE=	zfs
+LIB_PACKAGE=
+
 LIB=	nvpair
 LIBADD=	spl
 
-PACKAGE=	libzfs
 # user
 INCS=	libnvpair.h
 SRCS=	libnvpair.c \
diff --git a/cddl/lib/libspl/Makefile b/cddl/lib/libspl/Makefile
--- a/cddl/lib/libspl/Makefile
+++ b/cddl/lib/libspl/Makefile
@@ -4,9 +4,11 @@
 .PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libspl
 .PATH: ${SRCTOP}/sys/contrib/openzfs/include
 
+PACKAGE=	zfs
+LIB_PACKAGE=
+
 LIB=	spl
 LIBADD=
-PACKAGE=	libzfs
 
 SRCS = \
         assert.c \
diff --git a/cddl/lib/libtpool/Makefile b/cddl/lib/libtpool/Makefile
--- a/cddl/lib/libtpool/Makefile
+++ b/cddl/lib/libtpool/Makefile
@@ -1,11 +1,12 @@
 .PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libtpool
 .PATH: ${SRCTOP}/sys/contrib/openzfs/include
 
+PACKAGE=	zfs
+LIB_PACKAGE=
 
-LIB=	tpool
+LIB=		tpool
 SHLIBDIR?=	/lib
-LIBADD=	spl
-PACKAGE=	libzfs
+LIBADD=		spl
 
 INCS=	thread_pool_impl.h
 SRCS=	thread_pool.c
diff --git a/cddl/lib/libumem/Makefile b/cddl/lib/libumem/Makefile
--- a/cddl/lib/libumem/Makefile
+++ b/cddl/lib/libumem/Makefile
@@ -1,6 +1,8 @@
 .PATH: ${SRCTOP}/cddl/compat/opensolaris/lib/libumem
 
-PACKAGE=	libzfs
+PACKAGE=	zfs
+LIB_PACKAGE=
+
 LIB=	umem
 SRCS=	umem.c
 WARNS?=	3
diff --git a/cddl/lib/libuutil/Makefile b/cddl/lib/libuutil/Makefile
--- a/cddl/lib/libuutil/Makefile
+++ b/cddl/lib/libuutil/Makefile
@@ -1,6 +1,8 @@
 .PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libuutil
 
-PACKAGE=	libzfs
+PACKAGE=	zfs
+LIB_PACKAGE=
+
 LIB=	uutil
 SRCS=\
 	uu_alloc.c \
diff --git a/cddl/lib/libzdb/Makefile b/cddl/lib/libzdb/Makefile
--- a/cddl/lib/libzdb/Makefile
+++ b/cddl/lib/libzdb/Makefile
@@ -1,8 +1,10 @@
 .PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzdb
 .PATH: ${SRCTOP}/sys/contrib/openzfs/include
 
-LIB=	zdb
 PACKAGE=	zfs
+LIB_PACKAGE=
+
+LIB=	zdb
 
 INCS = libzdb.h
 
diff --git a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile
--- a/cddl/lib/libzfs/Makefile
+++ b/cddl/lib/libzfs/Makefile
@@ -7,7 +7,9 @@
 .PATH: ${SRCTOP}/sys/contrib/openzfs/module/zstd
 .PATH: ${SRCTOP}/sys/contrib/openzfs/module/zstd/lib
 
-PACKAGE=	libzfs
+PACKAGE=	zfs
+LIB_PACKAGE=
+
 LIB=	zfs
 LIBADD= \
 	avl \
diff --git a/cddl/lib/libzfs_core/Makefile b/cddl/lib/libzfs_core/Makefile
--- a/cddl/lib/libzfs_core/Makefile
+++ b/cddl/lib/libzfs_core/Makefile
@@ -3,10 +3,11 @@
 .PATH: ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/zfs
 .PATH: ${SRCTOP}/sys/contrib/openzfs/module/os/freebsd/zfs
 
+PACKAGE=	zfs
+LIB_PACKAGE=
 
 LIB=	zfs_core
 LIBADD=	nvpair spl zutil
-PACKAGE=	libzfs
 
 INCS=	libzfs_core.h
 SRCS=	libzfs_core.c \
diff --git a/cddl/lib/libzfsbootenv/Makefile b/cddl/lib/libzfsbootenv/Makefile
--- a/cddl/lib/libzfsbootenv/Makefile
+++ b/cddl/lib/libzfsbootenv/Makefile
@@ -2,6 +2,8 @@
 .PATH: ${SRCTOP}/sys/contrib/openzfs/include
 
 PACKAGE=	zfs
+LIB_PACKAGE=
+
 LIB=		zfsbootenv
 SHLIB_MAJOR=	1
 
diff --git a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile
--- a/cddl/lib/libzpool/Makefile
+++ b/cddl/lib/libzpool/Makefile
@@ -29,6 +29,8 @@
 .endif
 
 PACKAGE=	zfs
+LIB_PACKAGE=
+
 LIB=		zpool
 
 USER_C = \
diff --git a/cddl/lib/libzutil/Makefile b/cddl/lib/libzutil/Makefile
--- a/cddl/lib/libzutil/Makefile
+++ b/cddl/lib/libzutil/Makefile
@@ -2,9 +2,11 @@
 .PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzutil/os/freebsd
 .PATH: ${SRCTOP}/sys/contrib/openzfs/module/os/freebsd/zfs
 
+PACKAGE=	zfs
+LIB_PACKAGE=
+
 LIB=	zutil
 LIBADD=	avl geom m tpool
-PACKAGE=	libzfs
 
 INCS = zutil_import.h
 
diff --git a/lib/libbe/Makefile b/lib/libbe/Makefile
--- a/lib/libbe/Makefile
+++ b/lib/libbe/Makefile
@@ -3,6 +3,7 @@
 .include <src.opts.mk>
 
 PACKAGE=	zfs
+LIB_PACKAGE=
 LIB=		be
 SHLIB_MAJOR=	1
 SHLIB_MINOR=	0
diff --git a/lib/libufs/Makefile b/lib/libufs/Makefile
--- a/lib/libufs/Makefile
+++ b/lib/libufs/Makefile
@@ -1,4 +1,6 @@
-PACKAGE=	libufs
+PACKAGE=	ufs
+LIB_PACKAGE=
+
 LIB=	ufs
 SHLIBDIR?= /lib
 SHLIB_MAJOR=	8
diff --git a/release/packages/ucl/libufs-all.ucl b/release/packages/ucl/libufs-all.ucl
deleted file mode 100644
--- a/release/packages/ucl/libufs-all.ucl
+++ /dev/null
@@ -1,8 +0,0 @@
-comment = "Low-level access to UFS filesystems"
-desc = <<EOD
-The libufs library and the functions it provides are used for implementing
-utilities which need to access a UFS file system at a low level from userland.
-Facilities provided are used to implement utilities such as newfs(8) and
-dumpfs(8).  The libufs library is designed to be simple, and to provide
-functions that are traditionally useful to have.
-EOD
diff --git a/release/packages/ucl/libzfs-all.ucl b/release/packages/ucl/libzfs-all.ucl
deleted file mode 100644
--- a/release/packages/ucl/libzfs-all.ucl
+++ /dev/null
@@ -1,5 +0,0 @@
-comment = "ZFS filesystem library"
-desc = <<EOD
-libzfs allows applications to manage ZFS pools and filesystems.  Several
-libraries which libzfs requires are also provided.
-EOD