diff --git a/cddl/lib/libavl/Makefile b/cddl/lib/libavl/Makefile
index c816f07df223..ce77012def9f 100644
--- a/cddl/lib/libavl/Makefile
+++ b/cddl/lib/libavl/Makefile
@@ -1,14 +1,14 @@
 .PATH: ${SRCTOP}/sys/contrib/openzfs/module/avl
 
-PACKAGE=	zfs
+PACKAGE=	libzfs
 LIB=	avl
 LIBADD=	spl
 SRCS=	avl.c
 WARNS?=	3
 CFLAGS+= -DIN_BASE
 CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
 CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
 CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
 CFLAGS+= -I${SRCTOP}/sys
 CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h
 .include <bsd.lib.mk>
diff --git a/cddl/lib/libnvpair/Makefile b/cddl/lib/libnvpair/Makefile
index 9ae081b7a96e..2d9ef1c7af1e 100644
--- a/cddl/lib/libnvpair/Makefile
+++ b/cddl/lib/libnvpair/Makefile
@@ -1,29 +1,29 @@
 .PATH: ${SRCTOP}/sys/contrib/openzfs/module/nvpair
 .PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libnvpair
 .PATH: ${SRCTOP}/sys/contrib/openzfs/include
 
 LIB=	nvpair
 LIBADD=	spl
 
-PACKAGE=	zfs
+PACKAGE=	libzfs
 # user
 INCS=	libnvpair.h
 SRCS=	libnvpair.c \
 	libnvpair_json.c \
 	nvpair_alloc_system.c
 # kernel
 SRCS+= nvpair_alloc_fixed.c \
 	nvpair.c \
 	fnvpair.c
 
 WARNS?=	2
 CFLAGS+= -DIN_BASE -DHAVE_RPC_TYPES
 CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
 CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
 CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
 CFLAGS+= -I${SRCTOP}/sys
 CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
 CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h
 CFLAGS+= -DHAVE_ISSETUGID  -DHAVE_CONFIG_H -DHAVE_XDR_BYTESREC
 
 .include <bsd.lib.mk>
diff --git a/cddl/lib/libspl/Makefile b/cddl/lib/libspl/Makefile
index efeba68e4f03..d44e5cb19ab4 100644
--- a/cddl/lib/libspl/Makefile
+++ b/cddl/lib/libspl/Makefile
@@ -1,49 +1,49 @@
 .include <bsd.init.mk>
 .include <bsd.compiler.mk>
 
 .PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libspl
 .PATH: ${SRCTOP}/sys/contrib/openzfs/include
 
 LIB=	spl
 LIBADD=
-PACKAGE=	zfs
+PACKAGE=	libzfs
 
 SRCS = \
         assert.c \
 	backtrace.c \
         list.c \
         mkdirp.c \
         os/freebsd/zone.c \
         page.c \
         timestamp.c \
         include/sys/list.h \
         include/sys/list_impl.h
 
 # These functions are not required when bootstrapping and the atomic code
 # will not compile when building on macOS.
 .if !defined(BOOTSTRAPPING)
 SRCS += \
         atomic.c \
         getexecname.c \
         os/freebsd/getexecname.c \
         os/freebsd/gethostid.c \
         os/freebsd/getmntany.c \
         os/freebsd/mnttab.c
 .endif
 
 WARNS?=	2
 CSTD=	c99
 CFLAGS+= -DIN_BASE
 CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
 CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
 CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
 CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
 CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/module/icp/include
 CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h
 CFLAGS+= -DHAVE_ISSETUGID
 CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h
 .if ${COMPILER_TYPE} == "clang"
 CFLAGS.atomic.c+=	-Wno-error=atomic-alignment
 .endif
 
 .include <bsd.lib.mk>
diff --git a/cddl/lib/libtpool/Makefile b/cddl/lib/libtpool/Makefile
index 94b29c9ae72d..2afaf0c417e9 100644
--- a/cddl/lib/libtpool/Makefile
+++ b/cddl/lib/libtpool/Makefile
@@ -1,25 +1,25 @@
 .PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libtpool
 .PATH: ${SRCTOP}/sys/contrib/openzfs/include
 
 
 LIB=	tpool
 LIBADD=	spl
-PACKAGE=	zfs
+PACKAGE=	libzfs
 
 INCS=	thread_pool_impl.h
 SRCS=	thread_pool.c
 
 WARNS?=	2
 CSTD=	c99
 CFLAGS+= -DIN_BASE
 CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
 CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
 CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
 CFLAGS+= -I${SRCTOP}/sys
 CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
 CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/module/icp/include
 CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h
 CFLAGS+= -DHAVE_ISSETUGID 
 CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h
 
 .include <bsd.lib.mk>
diff --git a/cddl/lib/libumem/Makefile b/cddl/lib/libumem/Makefile
index f955e306c62c..9164ba771fe6 100644
--- a/cddl/lib/libumem/Makefile
+++ b/cddl/lib/libumem/Makefile
@@ -1,9 +1,9 @@
 .PATH: ${SRCTOP}/cddl/compat/opensolaris/lib/libumem
 
-PACKAGE=	zfs
+PACKAGE=	libzfs
 LIB=	umem
 SRCS=	umem.c
 WARNS?=	3
 CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/lib/libumem
 
 .include <bsd.lib.mk>
diff --git a/cddl/lib/libuutil/Makefile b/cddl/lib/libuutil/Makefile
index 547078504103..8c8a786ee039 100644
--- a/cddl/lib/libuutil/Makefile
+++ b/cddl/lib/libuutil/Makefile
@@ -1,24 +1,24 @@
 .PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libuutil
 
-PACKAGE=	zfs
+PACKAGE=	libzfs
 LIB=	uutil
 SRCS=\
 	uu_alloc.c \
 	uu_avl.c \
 	uu_ident.c \
 	uu_list.c \
 	uu_misc.c \
 	uu_string.c
 
 WARNS?=	2
 CFLAGS+= -DIN_BASE
 CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
 CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
 CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
 CFLAGS+= -I${SRCTOP}/sys
 CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
 CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h
 
 LIBADD= avl spl
 
 .include <bsd.lib.mk>
diff --git a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile
index bb0127a9108a..40553aa68719 100644
--- a/cddl/lib/libzfs/Makefile
+++ b/cddl/lib/libzfs/Makefile
@@ -1,108 +1,108 @@
 .PATH: ${SRCTOP}/sys/contrib/openzfs/module/icp
 .PATH: ${SRCTOP}/sys/contrib/openzfs/module/zcommon
 .PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzfs
 .PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzfs/os/freebsd
 .PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libshare
 .PATH: ${SRCTOP}/sys/contrib/openzfs/include
 .PATH: ${SRCTOP}/sys/contrib/openzfs/module/zstd
 .PATH: ${SRCTOP}/sys/contrib/openzfs/module/zstd/lib
 
-PACKAGE=	zfs
+PACKAGE=	libzfs
 LIB=	zfs
 LIBADD= \
 	avl \
 	bsdxml \
 	crypto \
 	geom \
 	m \
 	md \
 	nvpair \
 	pthread \
 	rt \
 	umem \
 	util \
 	uutil \
 	z \
 	zfs_core \
 	zutil
 
 INCS=	libzfs.h
 USER_C = \
         libzfs_changelist.c \
         libzfs_config.c \
         libzfs_crypto.c \
         libzfs_dataset.c \
         libzfs_diff.c \
         libzfs_import.c \
         libzfs_iter.c \
         libzfs_mount.c \
         libzfs_pool.c \
         libzfs_sendrecv.c \
         libzfs_status.c \
         libzfs_util.c
 
 # FreeBSD
 USER_C += \
         libzfs_compat.c \
         libzfs_zmount.c
 
 # libshare
 USER_C += \
 	libshare.c \
 	nfs.c \
 	os/freebsd/nfs.c \
 	os/freebsd/smb.c
 
 KERNEL_C = \
         cityhash.c \
         zfeature_common.c \
         zfs_comutil.c \
         zfs_deleg.c \
         zfs_fletcher.c \
         zfs_fletcher_superscalar.c \
         zfs_fletcher_superscalar4.c \
         zfs_namecheck.c \
         zfs_prop.c \
         zfs_valstr.c \
         zpool_prop.c \
         zprop_common.c
 
 ARCH_C =
 .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
 ARCH_C += 	zfs_fletcher_intel.c \
 		zfs_fletcher_sse.c 
 CFLAGS +=  -DHAVE_SSE2
 .endif
 .if ${MACHINE_ARCH} == "amd64"
 ARCH_C +=	zfs_fletcher_avx512.c
 CFLAGS+= -DHAVE_AVX2 -DHAVE_AVX -D__x86_64 -DHAVE_AVX512F
 .endif
 .if ${MACHINE_CPUARCH} == "aarch64"
 ARCH_C +=	zfs_fletcher_aarch64_neon.c
 .endif
 
 SRCS= $(USER_C) $(KERNEL_C) $(ARCH_C)
 
 WARNS?=	2
 SHLIB_MAJOR= 4
 CSTD=	c99
 CFLAGS+= -DIN_BASE
 CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
 CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include/os/freebsd
 CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include
 CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
 CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libshare
 CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzpool/include
 CFLAGS+= -I${SRCTOP}/sys/contrib/ck/include
 CFLAGS+= -I${SRCTOP}/sys
 CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
 CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/module/icp/include
 CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h
 CFLAGS+= -DHAVE_ISSETUGID
 CFLAGS+= -DHAVE_EXECVPE
 CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h
 CFLAGS+= -DSYSCONFDIR=\"/etc\"
 CFLAGS+= -DPKGDATADIR=\"/usr/share/zfs\"
 CFLAGS+= -DZFSEXECDIR=\"${LIBEXECDIR}/zfs\"
 
 .include <bsd.lib.mk>
diff --git a/cddl/lib/libzfs_core/Makefile b/cddl/lib/libzfs_core/Makefile
index d986c45725b3..8ce0a152852f 100644
--- a/cddl/lib/libzfs_core/Makefile
+++ b/cddl/lib/libzfs_core/Makefile
@@ -1,32 +1,32 @@
 .PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzfs_core
 .PATH: ${SRCTOP}/sys/contrib/openzfs/include
 .PATH: ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/zfs
 .PATH: ${SRCTOP}/sys/contrib/openzfs/module/os/freebsd/zfs
 
 
 LIB=	zfs_core
 LIBADD=	nvpair spl zutil
-PACKAGE=	zfs
+PACKAGE=	libzfs
 
 INCS=	libzfs_core.h
 SRCS=	libzfs_core.c \
 	os/freebsd/libzfs_core_ioctl.c \
 	zfs_ioctl_compat.c
 
 WARNS?=	2
 CSTD=	c99
 CFLAGS+= -DIN_BASE
 CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
 CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzfs_core/common
 CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
 CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
 CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzpool/include
 CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/zfs
 CFLAGS+= -I${SRCTOP}/sys
 CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
 CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/module/icp/include
 CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h
 CFLAGS+= -DHAVE_ISSETUGID
 CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h
 
 .include <bsd.lib.mk>
diff --git a/cddl/lib/libzutil/Makefile b/cddl/lib/libzutil/Makefile
index d1a943b25005..07ca3b9bc156 100644
--- a/cddl/lib/libzutil/Makefile
+++ b/cddl/lib/libzutil/Makefile
@@ -1,40 +1,40 @@
 .PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzutil
 .PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzutil/os/freebsd
 .PATH: ${SRCTOP}/sys/contrib/openzfs/module/os/freebsd/zfs
 
 LIB=	zutil
 LIBADD=	avl geom m tpool
-PACKAGE=	zfs
+PACKAGE=	libzfs
 
 INCS = zutil_import.h
 
 SRCS = \
         zutil_device_path.c \
         zutil_import.c \
         zutil_import.h \
         zutil_nicenum.c \
         zutil_pool.c
 
 SRCS += \
 	os/freebsd/zutil_device_path_os.c \
 	os/freebsd/zutil_import_os.c
 
 SRCS += zfs_ioctl_compat.c
 
 
 WARNS?=	2
 CSTD=	c99
 
 CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include
 CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/
 CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd
 CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzpool/include
 CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/zfs
 CFLAGS+= -I${SRCTOP}/sys
 CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include
 CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h
 CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzutil
 CFLAGS+= -DHAVE_ISSETUGID -DIN_BASE
 CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h
 
 .include <bsd.lib.mk>
diff --git a/lib/libufs/Makefile b/lib/libufs/Makefile
index 12c742e6b871..ab913f834bb3 100644
--- a/lib/libufs/Makefile
+++ b/lib/libufs/Makefile
@@ -1,38 +1,38 @@
-PACKAGE=	ufs
+PACKAGE=	libufs
 LIB=	ufs
 SHLIBDIR?= /lib
 SHLIB_MAJOR=	8
 
 SRCS=	block.c cgroup.c gsb_crc32.c inode.c sblock.c type.c ffs_subr.c
 SRCS+= ffs_tables.c
 INCS=	libufs.h
 
 MAN=	bread.3 cgread.3 getinode.3 libufs.3 sbread.3 ufs_disk_close.3
 MLINKS+= bread.3 bwrite.3
 MLINKS+= bread.3 berase.3
 MLINKS+= cgread.3 cgread1.3
 MLINKS+= cgread.3 cgget.3
 MLINKS+= cgread.3 cgwrite.3
 MLINKS+= cgread.3 cgwrite1.3
 MLINKS+= cgread.3 cgput.3
 MLINKS+= getinode.3 putinode.3
 MLINKS+= sbread.3 sbwrite.3
 MLINKS+= sbread.3 sbget.3
 MLINKS+= sbread.3 sbsearch.3
 MLINKS+= sbread.3 sbfind.3
 MLINKS+= sbread.3 sbput.3
 MLINKS+= ufs_disk_close.3 ufs_disk_fillout.3
 MLINKS+= ufs_disk_close.3 ufs_disk_fillout_blank.3
 MLINKS+= ufs_disk_close.3 ufs_disk_write.3
 
 .PATH:  ${SRCTOP}/sys/libkern ${SRCTOP}/sys/ufs/ffs
 
 WARNS?=	2
 
 CFLAGS+= -D_LIBUFS
 .if defined(LIBUFS_DEBUG)
 CFLAGS+= -D_LIBUFS_DEBUGGING
 .endif
 CFLAGS+= -I${.CURDIR}
 
 .include <bsd.lib.mk>