diff --git a/module/zfs/Makefile.in b/module/zfs/Makefile.in
index 1954b38696..2a44fa1751 100644
--- a/module/zfs/Makefile.in
+++ b/module/zfs/Makefile.in
@@ -1,6 +1,6 @@
 DISTFILES = *.c
 
-MODULE := zpool
+MODULE := zfs
 
 EXTRA_CFLAGS  = -I@MODDIR@/zfs/include
 EXTRA_CFLAGS += -I@MODDIR@/zcommon/include
diff --git a/module/zfs/zfs_ioctl.c b/module/zfs/zfs_ioctl.c
index 9733a546bf..947ef3e87f 100644
--- a/module/zfs/zfs_ioctl.c
+++ b/module/zfs/zfs_ioctl.c
@@ -2214,7 +2214,7 @@ zfs_ioc_snapshot(zfs_cmd_t *zc)
 	if (snapshot_namecheck(zc->zc_value, NULL, NULL) != 0)
 		return (EINVAL);
 
-	if (zc->zc_nvlist_src != NULL &&
+	if (zc->zc_nvlist_src != 0 &&
 	    (error = get_nvlist(zc->zc_nvlist_src, zc->zc_nvlist_src_size,
 	    &nvprops)) != 0)
 		return (error);
diff --git a/scripts/zfs.sh b/scripts/zfs.sh
index d724cad40d..0e2f87250c 100755
--- a/scripts/zfs.sh
+++ b/scripts/zfs.sh
@@ -22,7 +22,7 @@ zfs_modules=(					\
 	${MODDIR}/nvpair/znvpair.ko		\
 	${MODDIR}/unicode/zunicode.ko		\
 	${MODDIR}/zcommon/zcommon.ko		\
-	${MODDIR}/zfs/zpool.ko			\
+	${MODDIR}/zfs/zfs.ko			\
 )
 
 test_modules=(					\
@@ -58,8 +58,8 @@ OPTIONS:
 MODULE-OPTIONS:
 	Must be of the frm module="options", for example:
 
-$0 zpool="zfs_prefetch_disable=1"
-$0 zpool="zfs_prefetch_disable=1 zfs_mdcomp_disable=1"
+$0 zfs="zfs_prefetch_disable=1"
+$0 zfs="zfs_prefetch_disable=1 zfs_mdcomp_disable=1"
 $0 spl="spl_debug_mask=0"
 
 EOF