diff --git a/internal/fusekernel/fuse_kernel_freebsd.go b/internal/fusekernel/fuse_kernel_freebsd.go
index 53b846a..f04590f 100644
--- a/internal/fusekernel/fuse_kernel_freebsd.go
+++ b/internal/fusekernel/fuse_kernel_freebsd.go
@@ -1,4 +1,4 @@
-package bazilfuse
+package fuseshim
 
 import "time"
 
diff --git a/internal/fusekernel/fuse_kernel_linux.go b/internal/fusekernel/fuse_kernel_linux.go
index fc0509b..a464e50 100644
--- a/internal/fusekernel/fuse_kernel_linux.go
+++ b/internal/fusekernel/fuse_kernel_linux.go
@@ -1,4 +1,4 @@
-package bazilfuse
+package fuseshim
 
 import "time"
 
diff --git a/internal/fuseshim/mount_freebsd.go b/internal/fuseshim/mount_freebsd.go
index 3a02fa2..36b9aac 100644
--- a/internal/fuseshim/mount_freebsd.go
+++ b/internal/fuseshim/mount_freebsd.go
@@ -1,4 +1,4 @@
-package bazilfuse
+package fuseshim
 
 import (
 	"fmt"
diff --git a/internal/fuseshim/mount_linux.go b/internal/fuseshim/mount_linux.go
index 7f18132..dfe70b5 100644
--- a/internal/fuseshim/mount_linux.go
+++ b/internal/fuseshim/mount_linux.go
@@ -1,4 +1,4 @@
-package bazilfuse
+package fuseshim
 
 import (
 	"bufio"
diff --git a/internal/fuseshim/options_freebsd.go b/internal/fuseshim/options_freebsd.go
index 66bf0c3..b9ceae2 100644
--- a/internal/fuseshim/options_freebsd.go
+++ b/internal/fuseshim/options_freebsd.go
@@ -1,4 +1,4 @@
-package bazilfuse
+package fuseshim
 
 func localVolume(conf *mountConfig) error {
 	return nil
diff --git a/internal/fuseshim/options_linux.go b/internal/fuseshim/options_linux.go
index 66bf0c3..b9ceae2 100644
--- a/internal/fuseshim/options_linux.go
+++ b/internal/fuseshim/options_linux.go
@@ -1,4 +1,4 @@
-package bazilfuse
+package fuseshim
 
 func localVolume(conf *mountConfig) error {
 	return nil
diff --git a/samples/flushfs/flush_fs_test.go b/samples/flushfs/flush_fs_test.go
index 2f8f0fb..60d8d11 100644
--- a/samples/flushfs/flush_fs_test.go
+++ b/samples/flushfs/flush_fs_test.go
@@ -30,9 +30,9 @@ import (
 
 	"golang.org/x/sys/unix"
 
-	"github.com/jacobsa/bazilfuse"
 	"github.com/jacobsa/fuse/fsutil"
 	"github.com/jacobsa/fuse/fusetesting"
+	"github.com/jacobsa/fuse/internal/fuseshim"
 	"github.com/jacobsa/fuse/samples"
 	. "github.com/jacobsa/oglematchers"
 	. "github.com/jacobsa/ogletest"
@@ -58,8 +58,8 @@ type flushFSTest struct {
 
 func (t *flushFSTest) setUp(
 	ti *TestInfo,
-	flushErr bazilfuse.Errno,
-	fsyncErr bazilfuse.Errno,
+	flushErr fuseshim.Errno,
+	fsyncErr fuseshim.Errno,
 	readOnly bool) {
 	var err error
 
@@ -810,7 +810,7 @@ func init() { RegisterTestSuite(&FlushErrorTest{}) }
 
 func (t *FlushErrorTest) SetUp(ti *TestInfo) {
 	const noErr = 0
-	t.flushFSTest.setUp(ti, bazilfuse.ENOENT, noErr, false)
+	t.flushFSTest.setUp(ti, fuseshim.ENOENT, noErr, false)
 }
 
 func (t *FlushErrorTest) Close() {
@@ -890,7 +890,7 @@ func init() { RegisterTestSuite(&FsyncErrorTest{}) }
 
 func (t *FsyncErrorTest) SetUp(ti *TestInfo) {
 	const noErr = 0
-	t.flushFSTest.setUp(ti, noErr, bazilfuse.ENOENT, false)
+	t.flushFSTest.setUp(ti, noErr, fuseshim.ENOENT, false)
 }
 
 func (t *FsyncErrorTest) Fsync() {
diff --git a/samples/mount_sample/mount.go b/samples/mount_sample/mount.go
index c13fe3b..71707bf 100644
--- a/samples/mount_sample/mount.go
+++ b/samples/mount_sample/mount.go
@@ -24,8 +24,8 @@ import (
 	"os"
 	"runtime"
 
-	"github.com/jacobsa/bazilfuse"
 	"github.com/jacobsa/fuse"
+	"github.com/jacobsa/fuse/internal/fuseshim"
 	"github.com/jacobsa/fuse/samples/flushfs"
 	"golang.org/x/net/context"
 )
@@ -58,11 +58,11 @@ func makeFlushFS() (server fuse.Server, err error) {
 	var fsyncErr error
 
 	if *fFlushError != 0 {
-		flushErr = bazilfuse.Errno(*fFlushError)
+		flushErr = fuseshim.Errno(*fFlushError)
 	}
 
 	if *fFsyncError != 0 {
-		fsyncErr = bazilfuse.Errno(*fFsyncError)
+		fsyncErr = fuseshim.Errno(*fFsyncError)
 	}
 
 	// Report flushes and fsyncs by writing the contents followed by a newline.