diff --git a/etcd/etcd.go b/etcd/etcd.go
index 3a9d80204..458004441 100644
--- a/etcd/etcd.go
+++ b/etcd/etcd.go
@@ -33,7 +33,7 @@ import (
 	ehttp "github.com/coreos/etcd/http"
 	"github.com/coreos/etcd/log"
 	"github.com/coreos/etcd/metrics"
-	"github.com/coreos/etcd/pkg/fs"
+	"github.com/coreos/etcd/pkg/btrfs"
 	"github.com/coreos/etcd/server"
 	"github.com/coreos/etcd/store"
 )
@@ -104,8 +104,8 @@ func (e *Etcd) Run() {
 	}
 
 	// Set NOCOW for data directory in btrfs
-	if fs.IsBtrfs(e.Config.DataDir) {
-		fs.SetNOCOWDir(e.Config.DataDir)
+	if btrfs.IsBtrfs(e.Config.DataDir) {
+		btrfs.SetNOCOWDir(e.Config.DataDir)
 	}
 
 	var mbName string
diff --git a/pkg/fs/.util_linux.go.swp b/pkg/btrfs/.util_linux.go.swp
similarity index 100%
rename from pkg/fs/.util_linux.go.swp
rename to pkg/btrfs/.util_linux.go.swp
diff --git a/pkg/fs/fs.go b/pkg/btrfs/fs.go
similarity index 99%
rename from pkg/fs/fs.go
rename to pkg/btrfs/fs.go
index fb90e6041..990ae5856 100644
--- a/pkg/fs/fs.go
+++ b/pkg/btrfs/fs.go
@@ -1,4 +1,4 @@
-package fs
+package btrfs
 
 import (
 	"os"
diff --git a/pkg/fs/fs_test.go b/pkg/btrfs/fs_test.go
similarity index 97%
rename from pkg/fs/fs_test.go
rename to pkg/btrfs/fs_test.go
index 82a5e1631..30cd25e85 100644
--- a/pkg/fs/fs_test.go
+++ b/pkg/btrfs/fs_test.go
@@ -1,4 +1,4 @@
-package fs
+package btrfs
 
 import (
 	"io/ioutil"
diff --git a/test.sh b/test.sh
index cf2a2e8a7..d809e636c 100755
--- a/test.sh
+++ b/test.sh
@@ -23,8 +23,8 @@ go test -v ./server/v2/tests
 go test -i ./mod/lock/v2/tests
 go test -v ./mod/lock/v2/tests
 
-go test -i ./pkg/fs
-go test -v ./pkg/fs
+go test -i ./pkg/btrfs
+go test -v ./pkg/btrfs
 
 go test -i ./tests/functional
 ETCD_BIN_PATH=$(pwd)/bin/etcd go test -v ./tests/functional