client_test.go            | 6 +++---
 storage/piece_file.go     | 2 +-
 storage/piece_resource.go | 2 +-

diff --git a/client_test.go b/client_test.go
index 644a8a6915c7dc8b02ad50f84922ebd6ad84f39f..5da6b2cc3ed66279e76e672e5e4d570ef7b85e1f 100644
--- a/client_test.go
+++ b/client_test.go
@@ -244,11 +244,11 @@ 	})
 }
 
 func fileCachePieceResourceStorage(fc *filecache.Cache) storage.Client {
-	return storage.NewPiecePerResource(fc.AsResourceProvider())
+	return storage.NewResourcePieces(fc.AsResourceProvider())
 }
 
 func fileCachePieceFileStorage(fc *filecache.Cache) storage.Client {
-	return storage.NewPieceFileStorage(fc.AsFileStore())
+	return storage.NewFileStorePieces(fc.AsFileStore())
 }
 
 func TestClientTransferSmallCache(t *testing.T) {
@@ -794,7 +794,7 @@ 	require.NoError(t, err)
 	if ps.SetLeecherStorageCapacity {
 		fc.SetCapacity(ps.LeecherStorageCapacity)
 	}
-	cfg.DefaultStorage = storage.NewPieceFileStorage(fc.AsFileStore())
+	cfg.DefaultStorage = storage.NewFileStorePieces(fc.AsFileStore())
 	cfg.DataDir = leecherDataDir
 	leecher, _ := NewClient(&cfg)
 	defer leecher.Close()
diff --git a/storage/piece_file.go b/storage/piece_file.go
index 8a644d6813fb2f4f37be674bc245dac69269ca2e..aedd5c78744c50e19782cd94612ba52c60998af1 100644
--- a/storage/piece_file.go
+++ b/storage/piece_file.go
@@ -15,7 +15,7 @@ type pieceFileStorage struct {
 	fs missinggo.FileStore
 }
 
-func NewPieceFileStorage(fs missinggo.FileStore) Client {
+func NewFileStorePieces(fs missinggo.FileStore) Client {
 	return &pieceFileStorage{
 		fs: fs,
 	}
diff --git a/storage/piece_resource.go b/storage/piece_resource.go
index f87d3f0d15d283394e388419e1c5255cd08925a0..94306f97f693087372d0aa01f17b1035d9c79569 100644
--- a/storage/piece_resource.go
+++ b/storage/piece_resource.go
@@ -14,7 +14,7 @@ type piecePerResource struct {
 	p uniform.Provider
 }
 
-func NewPiecePerResource(p uniform.Provider) Client {
+func NewResourcePieces(p uniform.Provider) Client {
 	return &piecePerResource{
 		p: p,
 	}