84 files changed, 165 insertions, 165 deletions

diff --git a/object/blob.go b/object/blob.go
index 8f607074..1c827190 100644
--- a/object/blob.go
+++ b/object/blob.go
@@ -5,7 +5,7 @@ import objecttype "codeberg.org/lindenii/furgit/object/type"
 // Blob represents a Git blob object.
 //
 // This Blob object is fully materialized in memory.
-// Consider using objectstore/Store.ReadReaderContent,
+// Consider using objectstorer/Store.ReadReaderContent,
 // or appropriate streaming write APIs.
 type Blob struct {
 	Data []byte
diff --git a/object/resolve/resolver.go b/object/resolve/resolver.go
index d1affb72..3e76e96a 100644
--- a/object/resolve/resolver.go
+++ b/object/resolve/resolver.go
@@ -1,17 +1,17 @@
 package resolve
 
-import "codeberg.org/lindenii/furgit/object/store"
+import "codeberg.org/lindenii/furgit/object/storer"
 
 // Resolver resolves parsed and streamed objects from an object store.
 //
 // A Resolver does not take ownership of the store and does not close it.
 type Resolver struct {
-	store objectstore.Store
+	store objectstorer.Store
 }
 
 // New returns a Resolver that reads objects from store.
 //
 // The returned Resolver does not take ownership of store.
-func New(store objectstore.Store) *Resolver {
+func New(store objectstorer.Store) *Resolver {
 	return &Resolver{store: store}
 }
diff --git a/object/store/chain/bytes.go b/object/storer/chain/bytes.go
index d02b30bd..c3ec1eb8 100644
--- a/object/store/chain/bytes.go
+++ b/object/storer/chain/bytes.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 
 	objectid "codeberg.org/lindenii/furgit/object/id"
-	"codeberg.org/lindenii/furgit/object/store"
+	"codeberg.org/lindenii/furgit/object/storer"
 	objecttype "codeberg.org/lindenii/furgit/object/type"
 )
 
@@ -17,14 +17,14 @@ func (chain *Chain) ReadBytesFull(id objectid.ObjectID) ([]byte, error) {
 			return full, nil
 		}
 
-		if errors.Is(err, objectstore.ErrObjectNotFound) {
+		if errors.Is(err, objectstorer.ErrObjectNotFound) {
 			continue
 		}
 
-		return nil, fmt.Errorf("objectstore: backend %d read bytes full: %w", i, err)
+		return nil, fmt.Errorf("objectstorer: backend %d read bytes full: %w", i, err)
 	}
 
-	return nil, objectstore.ErrObjectNotFound
+	return nil, objectstorer.ErrObjectNotFound
 }
 
 // ReadBytesContent reads an object's type and content bytes from the first backend that has it.
@@ -35,12 +35,12 @@ func (chain *Chain) ReadBytesContent(id objectid.ObjectID) (objecttype.Type, []b
 			return ty, content, nil
 		}
 
-		if errors.Is(err, objectstore.ErrObjectNotFound) {
+		if errors.Is(err, objectstorer.ErrObjectNotFound) {
 			continue
 		}
 
-		return objecttype.TypeInvalid, nil, fmt.Errorf("objectstore: backend %d read bytes content: %w", i, err)
+		return objecttype.TypeInvalid, nil, fmt.Errorf("objectstorer: backend %d read bytes content: %w", i, err)
 	}
 
-	return objecttype.TypeInvalid, nil, objectstore.ErrObjectNotFound
+	return objecttype.TypeInvalid, nil, objectstorer.ErrObjectNotFound
 }
diff --git a/object/store/chain/chain.go b/object/storer/chain/chain.go
index 1a7f4201..8502b590 100644
--- a/object/store/chain/chain.go
+++ b/object/storer/chain/chain.go
@@ -3,12 +3,12 @@
 package chain
 
 import (
-	"codeberg.org/lindenii/furgit/object/store"
+	"codeberg.org/lindenii/furgit/object/storer"
 )
 
 // Chain queries multiple object databases in order.
 //
 // Chain borrows its backend stores.
 type Chain struct {
-	backends []objectstore.Store
+	backends []objectstorer.Store
 }
diff --git a/object/store/chain/close.go b/object/storer/chain/close.go
index 6bd74565..6bd74565 100644
--- a/object/store/chain/close.go
+++ b/object/storer/chain/close.go
diff --git a/object/store/chain/header.go b/object/storer/chain/header.go
index e66a5aae..e7791e9e 100644
--- a/object/store/chain/header.go
+++ b/object/storer/chain/header.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 
 	objectid "codeberg.org/lindenii/furgit/object/id"
-	"codeberg.org/lindenii/furgit/object/store"
+	"codeberg.org/lindenii/furgit/object/storer"
 	objecttype "codeberg.org/lindenii/furgit/object/type"
 )
 
@@ -17,12 +17,12 @@ func (chain *Chain) ReadHeader(id objectid.ObjectID) (objecttype.Type, int64, er
 			return ty, size, nil
 		}
 
-		if errors.Is(err, objectstore.ErrObjectNotFound) {
+		if errors.Is(err, objectstorer.ErrObjectNotFound) {
 			continue
 		}
 
-		return objecttype.TypeInvalid, 0, fmt.Errorf("objectstore: backend %d read header: %w", i, err)
+		return objecttype.TypeInvalid, 0, fmt.Errorf("objectstorer: backend %d read header: %w", i, err)
 	}
 
-	return objecttype.TypeInvalid, 0, objectstore.ErrObjectNotFound
+	return objecttype.TypeInvalid, 0, objectstorer.ErrObjectNotFound
 }
diff --git a/object/store/chain/new.go b/object/storer/chain/new.go
index 2cc79b0d..f7a4f141 100644
--- a/object/store/chain/new.go
+++ b/object/storer/chain/new.go
@@ -1,13 +1,13 @@
 package chain
 
-import "codeberg.org/lindenii/furgit/object/store"
+import "codeberg.org/lindenii/furgit/object/storer"
 
 // New creates an ordered object database chain.
 //
 // The provided backends must be non-nil and distinct.
 // Chain borrows the provided backends and does not close them in Close.
-func New(backends ...objectstore.Store) *Chain {
+func New(backends ...objectstorer.Store) *Chain {
 	return &Chain{
-		backends: append([]objectstore.Store(nil), backends...),
+		backends: append([]objectstorer.Store(nil), backends...),
 	}
 }
diff --git a/object/store/chain/reader.go b/object/storer/chain/reader.go
index 8d650503..3ac8cce7 100644
--- a/object/store/chain/reader.go
+++ b/object/storer/chain/reader.go
@@ -6,7 +6,7 @@ import (
 	"io"
 
 	objectid "codeberg.org/lindenii/furgit/object/id"
-	"codeberg.org/lindenii/furgit/object/store"
+	"codeberg.org/lindenii/furgit/object/storer"
 	objecttype "codeberg.org/lindenii/furgit/object/type"
 )
 
@@ -18,14 +18,14 @@ func (chain *Chain) ReadReaderFull(id objectid.ObjectID) (io.ReadCloser, error)
 			return reader, nil
 		}
 
-		if errors.Is(err, objectstore.ErrObjectNotFound) {
+		if errors.Is(err, objectstorer.ErrObjectNotFound) {
 			continue
 		}
 
-		return nil, fmt.Errorf("objectstore: backend %d read reader full: %w", i, err)
+		return nil, fmt.Errorf("objectstorer: backend %d read reader full: %w", i, err)
 	}
 
-	return nil, objectstore.ErrObjectNotFound
+	return nil, objectstorer.ErrObjectNotFound
 }
 
 // ReadReaderContent reads an object's type, declared content length, and content stream from the first backend that has it.
@@ -36,12 +36,12 @@ func (chain *Chain) ReadReaderContent(id objectid.ObjectID) (objecttype.Type, in
 			return ty, size, reader, nil
 		}
 
-		if errors.Is(err, objectstore.ErrObjectNotFound) {
+		if errors.Is(err, objectstorer.ErrObjectNotFound) {
 			continue
 		}
 
-		return objecttype.TypeInvalid, 0, nil, fmt.Errorf("objectstore: backend %d read reader content: %w", i, err)
+		return objecttype.TypeInvalid, 0, nil, fmt.Errorf("objectstorer: backend %d read reader content: %w", i, err)
 	}
 
-	return objecttype.TypeInvalid, 0, nil, objectstore.ErrObjectNotFound
+	return objecttype.TypeInvalid, 0, nil, objectstorer.ErrObjectNotFound
 }
diff --git a/object/store/chain/refresh.go b/object/storer/chain/refresh.go
index c47352dc..c47352dc 100644
--- a/object/store/chain/refresh.go
+++ b/object/storer/chain/refresh.go
diff --git a/object/store/chain/size.go b/object/storer/chain/size.go
index bd35139f..6ad7d12c 100644
--- a/object/store/chain/size.go
+++ b/object/storer/chain/size.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 
 	objectid "codeberg.org/lindenii/furgit/object/id"
-	"codeberg.org/lindenii/furgit/object/store"
+	"codeberg.org/lindenii/furgit/object/storer"
 )
 
 // ReadSize reads object content length from the first backend that has it.
@@ -16,12 +16,12 @@ func (chain *Chain) ReadSize(id objectid.ObjectID) (int64, error) {
 			return size, nil
 		}
 
-		if errors.Is(err, objectstore.ErrObjectNotFound) {
+		if errors.Is(err, objectstorer.ErrObjectNotFound) {
 			continue
 		}
 
-		return 0, fmt.Errorf("objectstore: backend %d read size: %w", i, err)
+		return 0, fmt.Errorf("objectstorer: backend %d read size: %w", i, err)
 	}
 
-	return 0, objectstore.ErrObjectNotFound
+	return 0, objectstorer.ErrObjectNotFound
 }
diff --git a/object/store/loose/helpers_test.go b/object/storer/loose/helpers_test.go
index e69c7e7a..1ad0ece9 100644
--- a/object/store/loose/helpers_test.go
+++ b/object/storer/loose/helpers_test.go
@@ -8,7 +8,7 @@ import (
 	"codeberg.org/lindenii/furgit/internal/testgit"
 	objectheader "codeberg.org/lindenii/furgit/object/header"
 	objectid "codeberg.org/lindenii/furgit/object/id"
-	"codeberg.org/lindenii/furgit/object/store/loose"
+	"codeberg.org/lindenii/furgit/object/storer/loose"
 	objecttype "codeberg.org/lindenii/furgit/object/type"
 )
 
diff --git a/object/store/loose/parse.go b/object/storer/loose/parse.go
index dfb420ba..789bd821 100644
--- a/object/store/loose/parse.go
+++ b/object/storer/loose/parse.go
@@ -27,12 +27,12 @@ func decodeAll(file *os.File) ([]byte, error) {
 func parseRaw(raw []byte) (objecttype.Type, []byte, error) {
 	ty, size, headerLen, ok := objectheader.Parse(raw)
 	if !ok {
-		return objecttype.TypeInvalid, nil, errors.New("objectstore/loose: malformed object header")
+		return objecttype.TypeInvalid, nil, errors.New("objectstorer/loose: malformed object header")
 	}
 
 	content := raw[headerLen:]
 	if int64(len(content)) != size {
-		return objecttype.TypeInvalid, nil, errors.New("objectstore/loose: object header size/content mismatch")
+		return objecttype.TypeInvalid, nil, errors.New("objectstorer/loose: object header size/content mismatch")
 	}
 
 	return ty, content, nil
@@ -48,7 +48,7 @@ func readHeader(br *bufio.Reader) ([]byte, objecttype.Type, int64, error) {
 
 	ty, size, _, ok := objectheader.Parse(header)
 	if !ok {
-		return nil, objecttype.TypeInvalid, 0, errors.New("objectstore/loose: malformed object header")
+		return nil, objecttype.TypeInvalid, 0, errors.New("objectstorer/loose: malformed object header")
 	}
 
 	return header, ty, size, nil
diff --git a/object/store/loose/paths.go b/object/storer/loose/paths.go
index e03f5c28..73cb0cf3 100644
--- a/object/store/loose/paths.go
+++ b/object/storer/loose/paths.go
@@ -8,13 +8,13 @@ import (
 	"path/filepath"
 
 	objectid "codeberg.org/lindenii/furgit/object/id"
-	"codeberg.org/lindenii/furgit/object/store"
+	"codeberg.org/lindenii/furgit/object/storer"
 )
 
 // objectPath returns the loose object path for id relative to the objects root.
 func (store *Store) objectPath(id objectid.ObjectID) (string, error) {
 	if id.Algorithm() != store.algo {
-		return "", fmt.Errorf("objectstore/loose: object id algorithm mismatch: got %s want %s", id.Algorithm(), store.algo)
+		return "", fmt.Errorf("objectstorer/loose: object id algorithm mismatch: got %s want %s", id.Algorithm(), store.algo)
 	}
 
 	hex := id.String()
@@ -23,7 +23,7 @@ func (store *Store) objectPath(id objectid.ObjectID) (string, error) {
 }
 
 // openObject opens the loose object file for id.
-// Missing files cause objectstore.ErrObjectNotFound.
+// Missing files cause objectstorer.ErrObjectNotFound.
 func (store *Store) openObject(id objectid.ObjectID) (*os.File, error) {
 	relPath, err := store.objectPath(id)
 	if err != nil {
@@ -33,7 +33,7 @@ func (store *Store) openObject(id objectid.ObjectID) (*os.File, error) {
 	file, err := store.root.Open(relPath)
 	if err != nil {
 		if errors.Is(err, fs.ErrNotExist) {
-			return nil, objectstore.ErrObjectNotFound
+			return nil, objectstorer.ErrObjectNotFound
 		}
 
 		return nil, err
diff --git a/object/store/loose/read_bytes.go b/object/storer/loose/read_bytes.go
index 0b6da81b..0b6da81b 100644
--- a/object/store/loose/read_bytes.go
+++ b/object/storer/loose/read_bytes.go
diff --git a/object/store/loose/read_header.go b/object/storer/loose/read_header.go
index 37bf40de..37bf40de 100644
--- a/object/store/loose/read_header.go
+++ b/object/storer/loose/read_header.go
diff --git a/object/store/loose/read_reader.go b/object/storer/loose/read_reader.go
index 29b71627..29b71627 100644
--- a/object/store/loose/read_reader.go
+++ b/object/storer/loose/read_reader.go
diff --git a/object/store/loose/read_size.go b/object/storer/loose/read_size.go
index 2ececc49..2ececc49 100644
--- a/object/store/loose/read_size.go
+++ b/object/storer/loose/read_size.go
diff --git a/object/store/loose/read_test.go b/object/storer/loose/read_test.go
index 4652670d..ece3c9db 100644
--- a/object/store/loose/read_test.go
+++ b/object/storer/loose/read_test.go
@@ -9,8 +9,8 @@ import (
 
 	"codeberg.org/lindenii/furgit/internal/testgit"
 	objectid "codeberg.org/lindenii/furgit/object/id"
-	"codeberg.org/lindenii/furgit/object/store"
-	"codeberg.org/lindenii/furgit/object/store/loose"
+	"codeberg.org/lindenii/furgit/object/storer"
+	"codeberg.org/lindenii/furgit/object/storer/loose"
 	objecttype "codeberg.org/lindenii/furgit/object/type"
 )
 
@@ -117,27 +117,27 @@ func TestLooseStoreErrors(t *testing.T) {
 		}
 
 		_, err = store.ReadBytesFull(notFoundID)
-		if !errors.Is(err, objectstore.ErrObjectNotFound) {
+		if !errors.Is(err, objectstorer.ErrObjectNotFound) {
 			t.Fatalf("ReadBytesFull not-found error = %v", err)
 		}
 
 		_, _, err = store.ReadBytesContent(notFoundID)
-		if !errors.Is(err, objectstore.ErrObjectNotFound) {
+		if !errors.Is(err, objectstorer.ErrObjectNotFound) {
 			t.Fatalf("ReadBytesContent not-found error = %v", err)
 		}
 
 		_, err = store.ReadReaderFull(notFoundID)
-		if !errors.Is(err, objectstore.ErrObjectNotFound) {
+		if !errors.Is(err, objectstorer.ErrObjectNotFound) {
 			t.Fatalf("ReadReaderFull not-found error = %v", err)
 		}
 
 		_, _, _, err = store.ReadReaderContent(notFoundID)
-		if !errors.Is(err, objectstore.ErrObjectNotFound) {
+		if !errors.Is(err, objectstorer.ErrObjectNotFound) {
 			t.Fatalf("ReadReaderContent not-found error = %v", err)
 		}
 
 		_, _, err = store.ReadHeader(notFoundID)
-		if !errors.Is(err, objectstore.ErrObjectNotFound) {
+		if !errors.Is(err, objectstorer.ErrObjectNotFound) {
 			t.Fatalf("ReadHeader not-found error = %v", err)
 		}
 
diff --git a/object/store/loose/refresh.go b/object/storer/loose/refresh.go
index b720ebc6..b720ebc6 100644
--- a/object/store/loose/refresh.go
+++ b/object/storer/loose/refresh.go
diff --git a/object/store/loose/store.go b/object/storer/loose/store.go
index d8eba84e..d8eba84e 100644
--- a/object/store/loose/store.go
+++ b/object/storer/loose/store.go
diff --git a/object/store/loose/write_bytes.go b/object/storer/loose/write_bytes.go
index ffc65117..ffc65117 100644
--- a/object/store/loose/write_bytes.go
+++ b/object/storer/loose/write_bytes.go
diff --git a/object/store/loose/write_reader.go b/object/storer/loose/write_reader.go
index f686f279..42d01ad8 100644
--- a/object/store/loose/write_reader.go
+++ b/object/storer/loose/write_reader.go
@@ -15,12 +15,12 @@ import (
 // header must be emitted before streaming content without buffering.
 func (store *Store) WriteReaderContent(ty objecttype.Type, size int64, src io.Reader) (objectid.ObjectID, error) {
 	if size < 0 {
-		return objectid.ObjectID{}, fmt.Errorf("objectstore/loose: negative content size: %d", size)
+		return objectid.ObjectID{}, fmt.Errorf("objectstorer/loose: negative content size: %d", size)
 	}
 
 	header, ok := objectheader.Encode(ty, size)
 	if !ok {
-		return objectid.ObjectID{}, fmt.Errorf("objectstore/loose: failed to encode object header for type %v", ty)
+		return objectid.ObjectID{}, fmt.Errorf("objectstorer/loose: failed to encode object header for type %v", ty)
 	}
 
 	writer, err := store.newStreamWriter(false)
diff --git a/object/store/loose/write_temp_object_file.go b/object/storer/loose/write_temp_object_file.go
index 1a78db48..4e7e6942 100644
--- a/object/store/loose/write_temp_object_file.go
+++ b/object/storer/loose/write_temp_object_file.go
@@ -26,5 +26,5 @@ func (store *Store) createTempObjectFile(dir string) (string, *os.File, error) {
 		return "", nil, err
 	}
 
-	return "", nil, errors.New("objectstore/loose: failed to create temporary object file")
+	return "", nil, errors.New("objectstorer/loose: failed to create temporary object file")
 }
diff --git a/object/store/loose/write_test.go b/object/storer/loose/write_test.go
index 30d8dbdb..30d8dbdb 100644
--- a/object/store/loose/write_test.go
+++ b/object/storer/loose/write_test.go
diff --git a/object/store/loose/write_writer.go b/object/storer/loose/write_writer.go
index 0d6b5b80..9d6187c7 100644
--- a/object/store/loose/write_writer.go
+++ b/object/storer/loose/write_writer.go
@@ -66,11 +66,11 @@ func (store *Store) newStreamWriter(fullMode bool) (*streamWriter, error) {
 // In full mode, it parses and enforces the streamed header-declared content size.
 func (writer *streamWriter) Write(src []byte) (int, error) {
 	if writer.finalized {
-		return 0, errors.New("objectstore/loose: write after finalize")
+		return 0, errors.New("objectstorer/loose: write after finalize")
 	}
 
 	if writer.closed {
-		return 0, errors.New("objectstore/loose: write after close")
+		return 0, errors.New("objectstorer/loose: write after close")
 	}
 
 	if writer.fullMode {
diff --git a/object/store/loose/write_writer_accept.go b/object/storer/loose/write_writer_accept.go
index bf55966a..bd3a8566 100644
--- a/object/store/loose/write_writer_accept.go
+++ b/object/storer/loose/write_writer_accept.go
@@ -17,7 +17,7 @@ func (writer *streamWriter) acceptFull(src []byte) error {
 
 			_, size, _, ok := objectheader.Parse(writer.headerBuf)
 			if !ok {
-				return errors.New("objectstore/loose: malformed object header")
+				return errors.New("objectstorer/loose: malformed object header")
 			}
 
 			writer.headerDone = true
@@ -37,7 +37,7 @@ func (writer *streamWriter) acceptFull(src []byte) error {
 // acceptContent validates and accounts content byte counts.
 func (writer *streamWriter) acceptContent(n int64) error {
 	if n > writer.expectedContentLeft {
-		return errors.New("objectstore/loose: object content exceeds declared size")
+		return errors.New("objectstorer/loose: object content exceeds declared size")
 	}
 
 	writer.expectedContentLeft -= n
diff --git a/object/store/loose/write_writer_finalize.go b/object/storer/loose/write_writer_finalize.go
index f8dee54d..e38f301a 100644
--- a/object/store/loose/write_writer_finalize.go
+++ b/object/storer/loose/write_writer_finalize.go
@@ -38,11 +38,11 @@ func (writer *streamWriter) finalize() (objectid.ObjectID, error) {
 	}
 
 	if writer.fullMode && !writer.headerDone {
-		return zero, errors.New("objectstore/loose: missing full object header")
+		return zero, errors.New("objectstorer/loose: missing full object header")
 	}
 
 	if writer.expectedContentLeft != 0 {
-		return zero, errors.New("objectstore/loose: object content shorter than declared size")
+		return zero, errors.New("objectstorer/loose: object content shorter than declared size")
 	}
 
 	idBytes := writer.hash.Sum(nil)
diff --git a/object/store/memory/add.go b/object/storer/memory/add.go
index 3b27f52d..3b27f52d 100644
--- a/object/store/memory/add.go
+++ b/object/storer/memory/add.go
diff --git a/object/store/memory/algorithm.go b/object/storer/memory/algorithm.go
index bf7f3a82..bf7f3a82 100644
--- a/object/store/memory/algorithm.go
+++ b/object/storer/memory/algorithm.go
diff --git a/object/store/memory/doc.go b/object/storer/memory/doc.go
index cb40d466..cb40d466 100644
--- a/object/store/memory/doc.go
+++ b/object/storer/memory/doc.go
diff --git a/object/store/memory/object.go b/object/storer/memory/object.go
index a85175c7..a85175c7 100644
--- a/object/store/memory/object.go
+++ b/object/storer/memory/object.go
diff --git a/object/store/memory/read_bytes.go b/object/storer/memory/read_bytes.go
index b9a439b5..72eaba11 100644
--- a/object/store/memory/read_bytes.go
+++ b/object/storer/memory/read_bytes.go
@@ -3,7 +3,7 @@ package memory
 import (
 	objectheader "codeberg.org/lindenii/furgit/object/header"
 	objectid "codeberg.org/lindenii/furgit/object/id"
-	"codeberg.org/lindenii/furgit/object/store"
+	"codeberg.org/lindenii/furgit/object/storer"
 	objecttype "codeberg.org/lindenii/furgit/object/type"
 )
 
@@ -11,7 +11,7 @@ import (
 func (store *Store) ReadBytesFull(id objectid.ObjectID) ([]byte, error) {
 	obj, ok := store.objects[id]
 	if !ok {
-		return nil, objectstore.ErrObjectNotFound
+		return nil, objectstorer.ErrObjectNotFound
 	}
 
 	header, ok := objectheader.Encode(obj.ty, int64(len(obj.content)))
@@ -30,7 +30,7 @@ func (store *Store) ReadBytesFull(id objectid.ObjectID) ([]byte, error) {
 func (store *Store) ReadBytesContent(id objectid.ObjectID) (objecttype.Type, []byte, error) {
 	obj, ok := store.objects[id]
 	if !ok {
-		return objecttype.TypeInvalid, nil, objectstore.ErrObjectNotFound
+		return objecttype.TypeInvalid, nil, objectstorer.ErrObjectNotFound
 	}
 
 	return obj.ty, append([]byte(nil), obj.content...), nil
diff --git a/object/store/memory/read_header.go b/object/storer/memory/read_header.go
index cbd24ea9..56979d3c 100644
--- a/object/store/memory/read_header.go
+++ b/object/storer/memory/read_header.go
@@ -2,7 +2,7 @@ package memory
 
 import (
 	objectid "codeberg.org/lindenii/furgit/object/id"
-	"codeberg.org/lindenii/furgit/object/store"
+	"codeberg.org/lindenii/furgit/object/storer"
 	objecttype "codeberg.org/lindenii/furgit/object/type"
 )
 
@@ -10,7 +10,7 @@ import (
 func (store *Store) ReadHeader(id objectid.ObjectID) (objecttype.Type, int64, error) {
 	obj, ok := store.objects[id]
 	if !ok {
-		return objecttype.TypeInvalid, 0, objectstore.ErrObjectNotFound
+		return objecttype.TypeInvalid, 0, objectstorer.ErrObjectNotFound
 	}
 
 	return obj.ty, int64(len(obj.content)), nil
diff --git a/object/store/memory/read_reader.go b/object/storer/memory/read_reader.go
index 425c3034..425c3034 100644
--- a/object/store/memory/read_reader.go
+++ b/object/storer/memory/read_reader.go
diff --git a/object/store/memory/read_size.go b/object/storer/memory/read_size.go
index 7045bd61..7045bd61 100644
--- a/object/store/memory/read_size.go
+++ b/object/storer/memory/read_size.go
diff --git a/object/store/memory/refresh.go b/object/storer/memory/refresh.go
index 1e18eef3..1e18eef3 100644
--- a/object/store/memory/refresh.go
+++ b/object/storer/memory/refresh.go
diff --git a/object/store/memory/store.go b/object/storer/memory/store.go
index 8f212c38..8f212c38 100644
--- a/object/store/memory/store.go
+++ b/object/storer/memory/store.go
diff --git a/object/store/mix/bytes.go b/object/storer/mix/bytes.go
index 9bee34e6..d2a7dc0e 100644
--- a/object/store/mix/bytes.go
+++ b/object/storer/mix/bytes.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 
 	objectid "codeberg.org/lindenii/furgit/object/id"
-	"codeberg.org/lindenii/furgit/object/store"
+	"codeberg.org/lindenii/furgit/object/storer"
 	objecttype "codeberg.org/lindenii/furgit/object/type"
 )
 
@@ -19,14 +19,14 @@ func (mix *Mix) ReadBytesFull(id objectid.ObjectID) ([]byte, error) {
 			return full, nil
 		}
 
-		if errors.Is(err, objectstore.ErrObjectNotFound) {
+		if errors.Is(err, objectstorer.ErrObjectNotFound) {
 			continue
 		}
 
-		return nil, fmt.Errorf("objectstore: backend %d read bytes full: %w", i, err)
+		return nil, fmt.Errorf("objectstorer: backend %d read bytes full: %w", i, err)
 	}
 
-	return nil, objectstore.ErrObjectNotFound
+	return nil, objectstorer.ErrObjectNotFound
 }
 
 // ReadBytesContent reads an object's type and content bytes from one backend
@@ -40,12 +40,12 @@ func (mix *Mix) ReadBytesContent(id objectid.ObjectID) (objecttype.Type, []byte,
 			return ty, content, nil
 		}
 
-		if errors.Is(err, objectstore.ErrObjectNotFound) {
+		if errors.Is(err, objectstorer.ErrObjectNotFound) {
 			continue
 		}
 
-		return objecttype.TypeInvalid, nil, fmt.Errorf("objectstore: backend %d read bytes content: %w", i, err)
+		return objecttype.TypeInvalid, nil, fmt.Errorf("objectstorer: backend %d read bytes content: %w", i, err)
 	}
 
-	return objecttype.TypeInvalid, nil, objectstore.ErrObjectNotFound
+	return objecttype.TypeInvalid, nil, objectstorer.ErrObjectNotFound
 }
diff --git a/object/store/mix/close.go b/object/storer/mix/close.go
index 53f6cd30..53f6cd30 100644
--- a/object/store/mix/close.go
+++ b/object/storer/mix/close.go
diff --git a/object/store/mix/header.go b/object/storer/mix/header.go
index 78ad4d15..6a5abf26 100644
--- a/object/store/mix/header.go
+++ b/object/storer/mix/header.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 
 	objectid "codeberg.org/lindenii/furgit/object/id"
-	"codeberg.org/lindenii/furgit/object/store"
+	"codeberg.org/lindenii/furgit/object/storer"
 	objecttype "codeberg.org/lindenii/furgit/object/type"
 )
 
@@ -19,12 +19,12 @@ func (mix *Mix) ReadHeader(id objectid.ObjectID) (objecttype.Type, int64, error)
 			return ty, size, nil
 		}
 
-		if errors.Is(err, objectstore.ErrObjectNotFound) {
+		if errors.Is(err, objectstorer.ErrObjectNotFound) {
 			continue
 		}
 
-		return objecttype.TypeInvalid, 0, fmt.Errorf("objectstore: backend %d read header: %w", i, err)
+		return objecttype.TypeInvalid, 0, fmt.Errorf("objectstorer: backend %d read header: %w", i, err)
 	}
 
-	return objecttype.TypeInvalid, 0, objectstore.ErrObjectNotFound
+	return objecttype.TypeInvalid, 0, objectstorer.ErrObjectNotFound
 }
diff --git a/object/store/mix/mix.go b/object/storer/mix/mix.go
index 1149ad7b..9edda31e 100644
--- a/object/store/mix/mix.go
+++ b/object/storer/mix/mix.go
@@ -5,7 +5,7 @@ package mix
 import (
 	"sync"
 
-	"codeberg.org/lindenii/furgit/object/store"
+	"codeberg.org/lindenii/furgit/object/storer"
 )
 
 // Mix queries multiple object databases with an MRU backend preference.
@@ -16,5 +16,5 @@ type Mix struct {
 
 	backendHead        *backendNode
 	backendTail        *backendNode
-	backendNodeByStore map[objectstore.Store]*backendNode
+	backendNodeByStore map[objectstorer.Store]*backendNode
 }
diff --git a/object/store/mix/mru.go b/object/storer/mix/mru.go
index b7663125..172a641a 100644
--- a/object/store/mix/mru.go
+++ b/object/storer/mix/mru.go
@@ -1,15 +1,15 @@
 package mix
 
-import "codeberg.org/lindenii/furgit/object/store"
+import "codeberg.org/lindenii/furgit/object/storer"
 
 type backendNode struct {
-	backend objectstore.Store
+	backend objectstorer.Store
 	prev    *backendNode
 	next    *backendNode
 }
 
 //nolint:ireturn
-func (mix *Mix) firstBackend() objectstore.Store {
+func (mix *Mix) firstBackend() objectstorer.Store {
 	mix.mu.RLock()
 	defer mix.mu.RUnlock()
 
@@ -21,7 +21,7 @@ func (mix *Mix) firstBackend() objectstore.Store {
 }
 
 //nolint:ireturn
-func (mix *Mix) nextBackend(current objectstore.Store) objectstore.Store {
+func (mix *Mix) nextBackend(current objectstorer.Store) objectstorer.Store {
 	mix.mu.RLock()
 	defer mix.mu.RUnlock()
 
@@ -33,7 +33,7 @@ func (mix *Mix) nextBackend(current objectstore.Store) objectstore.Store {
 	return node.next.backend
 }
 
-func (mix *Mix) touchBackend(backend objectstore.Store) {
+func (mix *Mix) touchBackend(backend objectstorer.Store) {
 	if backend == nil {
 		return
 	}
diff --git a/object/store/mix/new.go b/object/storer/mix/new.go
index bb39178c..f92e2724 100644
--- a/object/store/mix/new.go
+++ b/object/storer/mix/new.go
@@ -1,13 +1,13 @@
 package mix
 
-import "codeberg.org/lindenii/furgit/object/store"
+import "codeberg.org/lindenii/furgit/object/storer"
 
 // New creates a Mix from backends.
 //
 // The provided backends must be non-nil and distinct.
 // Mix borrows the provided backends and does not close them in Close.
-func New(backends ...objectstore.Store) *Mix {
-	nodeByStore := make(map[objectstore.Store]*backendNode, len(backends))
+func New(backends ...objectstorer.Store) *Mix {
+	nodeByStore := make(map[objectstorer.Store]*backendNode, len(backends))
 
 	var (
 		head *backendNode
diff --git a/object/store/mix/reader.go b/object/storer/mix/reader.go
index 327e9e11..66fce069 100644
--- a/object/store/mix/reader.go
+++ b/object/storer/mix/reader.go
@@ -6,7 +6,7 @@ import (
 	"io"
 
 	objectid "codeberg.org/lindenii/furgit/object/id"
-	"codeberg.org/lindenii/furgit/object/store"
+	"codeberg.org/lindenii/furgit/object/storer"
 	objecttype "codeberg.org/lindenii/furgit/object/type"
 )
 
@@ -21,14 +21,14 @@ func (mix *Mix) ReadReaderFull(id objectid.ObjectID) (io.ReadCloser, error) {
 			return reader, nil
 		}
 
-		if errors.Is(err, objectstore.ErrObjectNotFound) {
+		if errors.Is(err, objectstorer.ErrObjectNotFound) {
 			continue
 		}
 
-		return nil, fmt.Errorf("objectstore: backend %d read reader full: %w", i, err)
+		return nil, fmt.Errorf("objectstorer: backend %d read reader full: %w", i, err)
 	}
 
-	return nil, objectstore.ErrObjectNotFound
+	return nil, objectstorer.ErrObjectNotFound
 }
 
 // ReadReaderContent reads an object's type, declared content length, and
@@ -42,12 +42,12 @@ func (mix *Mix) ReadReaderContent(id objectid.ObjectID) (objecttype.Type, int64,
 			return ty, size, reader, nil
 		}
 
-		if errors.Is(err, objectstore.ErrObjectNotFound) {
+		if errors.Is(err, objectstorer.ErrObjectNotFound) {
 			continue
 		}
 
-		return objecttype.TypeInvalid, 0, nil, fmt.Errorf("objectstore: backend %d read reader content: %w", i, err)
+		return objecttype.TypeInvalid, 0, nil, fmt.Errorf("objectstorer: backend %d read reader content: %w", i, err)
 	}
 
-	return objecttype.TypeInvalid, 0, nil, objectstore.ErrObjectNotFound
+	return objecttype.TypeInvalid, 0, nil, objectstorer.ErrObjectNotFound
 }
diff --git a/object/store/mix/refresh.go b/object/storer/mix/refresh.go
index 2150b71a..916d9e8f 100644
--- a/object/store/mix/refresh.go
+++ b/object/storer/mix/refresh.go
@@ -3,14 +3,14 @@ package mix
 import (
 	"errors"
 
-	"codeberg.org/lindenii/furgit/object/store"
+	"codeberg.org/lindenii/furgit/object/storer"
 )
 
 // Refresh forwards refresh calls to refresh-capable backends.
 func (mix *Mix) Refresh() error {
 	mix.mu.RLock()
 
-	backends := make([]objectstore.Store, 0, len(mix.backendNodeByStore))
+	backends := make([]objectstorer.Store, 0, len(mix.backendNodeByStore))
 	for node := mix.backendHead; node != nil; node = node.next {
 		backends = append(backends, node.backend)
 	}
diff --git a/object/store/mix/size.go b/object/storer/mix/size.go
index 04f8117f..b761177d 100644
--- a/object/store/mix/size.go
+++ b/object/storer/mix/size.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 
 	objectid "codeberg.org/lindenii/furgit/object/id"
-	"codeberg.org/lindenii/furgit/object/store"
+	"codeberg.org/lindenii/furgit/object/storer"
 )
 
 // ReadSize reads object content length from one backend that has it.
@@ -18,12 +18,12 @@ func (mix *Mix) ReadSize(id objectid.ObjectID) (int64, error) {
 			return size, nil
 		}
 
-		if errors.Is(err, objectstore.ErrObjectNotFound) {
+		if errors.Is(err, objectstorer.ErrObjectNotFound) {
 			continue
 		}
 
-		return 0, fmt.Errorf("objectstore: backend %d read size: %w", i, err)
+		return 0, fmt.Errorf("objectstorer: backend %d read size: %w", i, err)
 	}
 
-	return 0, objectstore.ErrObjectNotFound
+	return 0, objectstorer.ErrObjectNotFound
 }
diff --git a/object/store/objectstore.go b/object/storer/objectstore.go
index d43dbccd..398e77ce 100644
--- a/object/store/objectstore.go
+++ b/object/storer/objectstore.go
@@ -1,5 +1,5 @@
-// Package objectstore provides interfaces for object storage backends.
-package objectstore
+// Package objectstorer provides interfaces for object storage backends.
+package objectstorer
 
 import (
 	"errors"
@@ -16,7 +16,7 @@ import (
 // object references another (such as a tree referencing a blob) but
 // the latter does not exist; these situations should use a separate
 // error (TODO).
-var ErrObjectNotFound = errors.New("objectstore: object not found")
+var ErrObjectNotFound = errors.New("objectstorer: object not found")
 
 // Store reads Git objects by object ID.
 //
diff --git a/object/store/packed/TODO b/object/storer/packed/TODO
index f4a5f48e..f4a5f48e 100644
--- a/object/store/packed/TODO
+++ b/object/storer/packed/TODO
diff --git a/object/store/packed/close.go b/object/storer/packed/close.go
index f05a8573..f05a8573 100644
--- a/object/store/packed/close.go
+++ b/object/storer/packed/close.go
diff --git a/object/store/packed/delta_build_chain.go b/object/storer/packed/delta_build_chain.go
index 4f24b284..c348e4d5 100644
--- a/object/store/packed/delta_build_chain.go
+++ b/object/storer/packed/delta_build_chain.go
@@ -16,7 +16,7 @@ func (store *Store) deltaBuildChain(start location) (deltaChain, error) {
 
 	for {
 		if _, ok := visited[current]; ok {
-			return deltaChain{}, fmt.Errorf("objectstore/packed: delta cycle while resolving object")
+			return deltaChain{}, fmt.Errorf("objectstorer/packed: delta cycle while resolving object")
 		}
 
 		visited[current] = struct{}{}
@@ -56,11 +56,11 @@ func (store *Store) deltaBuildChain(start location) (deltaChain, error) {
 				offset:   meta.baseOfs,
 			}
 		case objecttype.TypeCommit, objecttype.TypeTree, objecttype.TypeBlob, objecttype.TypeTag:
-			return deltaChain{}, fmt.Errorf("objectstore/packed: internal invariant violation for base type %d", meta.ty)
+			return deltaChain{}, fmt.Errorf("objectstorer/packed: internal invariant violation for base type %d", meta.ty)
 		case objecttype.TypeInvalid, objecttype.TypeFuture:
-			return deltaChain{}, fmt.Errorf("objectstore/packed: unsupported pack type %d", meta.ty)
+			return deltaChain{}, fmt.Errorf("objectstorer/packed: unsupported pack type %d", meta.ty)
 		default:
-			return deltaChain{}, fmt.Errorf("objectstore/packed: unsupported pack type %d", meta.ty)
+			return deltaChain{}, fmt.Errorf("objectstorer/packed: unsupported pack type %d", meta.ty)
 		}
 	}
 }
diff --git a/object/store/packed/delta_cache.go b/object/storer/packed/delta_cache.go
index 3bf3a035..3bf3a035 100644
--- a/object/store/packed/delta_cache.go
+++ b/object/storer/packed/delta_cache.go
diff --git a/object/store/packed/delta_chain.go b/object/storer/packed/delta_chain.go
index 372e89cd..372e89cd 100644
--- a/object/store/packed/delta_chain.go
+++ b/object/storer/packed/delta_chain.go
diff --git a/object/store/packed/delta_node.go b/object/storer/packed/delta_node.go
index 24ede1e0..24ede1e0 100644
--- a/object/store/packed/delta_node.go
+++ b/object/storer/packed/delta_node.go
diff --git a/object/store/packed/delta_resolve_chain.go b/object/storer/packed/delta_resolve_chain.go
index 47992ceb..0c71b628 100644
--- a/object/store/packed/delta_resolve_chain.go
+++ b/object/storer/packed/delta_resolve_chain.go
@@ -43,7 +43,7 @@ func (store *Store) deltaResolveChain(chain deltaChain, declaredSize int64) (obj
 
 	if int64(len(out)) != declaredSize {
 		return objecttype.TypeInvalid, nil, fmt.Errorf(
-			"objectstore/packed: resolved content size mismatch: got %d want %d",
+			"objectstorer/packed: resolved content size mismatch: got %d want %d",
 			len(out),
 			declaredSize,
 		)
@@ -51,7 +51,7 @@ func (store *Store) deltaResolveChain(chain deltaChain, declaredSize int64) (obj
 
 	if ty != chain.baseType {
 		return objecttype.TypeInvalid, nil, fmt.Errorf(
-			"objectstore/packed: resolved content type mismatch: got %d want %d",
+			"objectstorer/packed: resolved content type mismatch: got %d want %d",
 			ty,
 			chain.baseType,
 		)
diff --git a/object/store/packed/delta_resolve_chain_start.go b/object/storer/packed/delta_resolve_chain_start.go
index 08e2bf48..53050134 100644
--- a/object/store/packed/delta_resolve_chain_start.go
+++ b/object/storer/packed/delta_resolve_chain_start.go
@@ -39,7 +39,7 @@ func (store *Store) deltaResolveChainStart(chain deltaChain) (objecttype.Type, [
 	}
 
 	if !packfmt.IsBaseObjectType(meta.ty) {
-		return objecttype.TypeInvalid, nil, 0, fmt.Errorf("objectstore/packed: delta chain base is not a base object")
+		return objecttype.TypeInvalid, nil, 0, fmt.Errorf("objectstorer/packed: delta chain base is not a base object")
 	}
 
 	base, err := inflateAt(pack, meta.dataOffset, meta.size)
diff --git a/object/store/packed/delta_resolve_content.go b/object/storer/packed/delta_resolve_content.go
index 06fc4226..06fc4226 100644
--- a/object/store/packed/delta_resolve_content.go
+++ b/object/storer/packed/delta_resolve_content.go
diff --git a/object/store/packed/delta_size.go b/object/storer/packed/delta_size.go
index 6896c939..6896c939 100644
--- a/object/store/packed/delta_size.go
+++ b/object/storer/packed/delta_size.go
diff --git a/object/store/packed/entry_inflate.go b/object/storer/packed/entry_inflate.go
index 1c3943e9..b7926b70 100644
--- a/object/store/packed/entry_inflate.go
+++ b/object/storer/packed/entry_inflate.go
@@ -12,7 +12,7 @@ import (
 // zlibReaderAt opens a zlib reader starting at data offset within pack.
 func zlibReaderAt(pack *packFile, offset int) (io.ReadCloser, error) {
 	if offset < 0 || offset > len(pack.data) {
-		return nil, fmt.Errorf("objectstore/packed: pack %q zlib offset out of bounds", pack.name)
+		return nil, fmt.Errorf("objectstorer/packed: pack %q zlib offset out of bounds", pack.name)
 	}
 
 	return zlib.NewReader(bytes.NewReader(pack.data[offset:]))
@@ -30,7 +30,7 @@ func inflateAt(pack *packFile, offset int, expectedSize int64) ([]byte, error) {
 	if expectedSize >= 0 {
 		if expectedSize > int64(math.MaxInt) {
 			return nil, fmt.Errorf(
-				"objectstore/packed: pack %q expected inflated size overflows int: %d",
+				"objectstorer/packed: pack %q expected inflated size overflows int: %d",
 				pack.name,
 				expectedSize,
 			)
diff --git a/object/store/packed/entry_meta.go b/object/storer/packed/entry_meta.go
index 0bbe8bef..0bbe8bef 100644
--- a/object/store/packed/entry_meta.go
+++ b/object/storer/packed/entry_meta.go
diff --git a/object/store/packed/entry_parse.go b/object/storer/packed/entry_parse.go
index be8f3c4c..bbbbc469 100644
--- a/object/store/packed/entry_parse.go
+++ b/object/storer/packed/entry_parse.go
@@ -27,17 +27,17 @@ type entryMeta struct {
 func parseEntryMeta(pack *packFile, algo objectid.Algorithm, offset uint64) (entryMeta, error) {
 	var zero entryMeta
 	if offset >= uint64(len(pack.data)) {
-		return zero, fmt.Errorf("objectstore/packed: pack %q offset %d out of bounds", pack.name, offset)
+		return zero, fmt.Errorf("objectstorer/packed: pack %q offset %d out of bounds", pack.name, offset)
 	}
 
 	pos, err := intconv.Uint64ToInt(offset)
 	if err != nil {
-		return zero, fmt.Errorf("objectstore/packed: pack %q offset conversion: %w", pack.name, err)
+		return zero, fmt.Errorf("objectstorer/packed: pack %q offset conversion: %w", pack.name, err)
 	}
 
 	entry, err := packfmt.ParseEntry(pack.data[pos:], algo.Size())
 	if err != nil {
-		return zero, fmt.Errorf("objectstore/packed: pack %q: %w", pack.name, err)
+		return zero, fmt.Errorf("objectstorer/packed: pack %q: %w", pack.name, err)
 	}
 
 	meta := entryMeta{
@@ -49,22 +49,22 @@ func parseEntryMeta(pack *packFile, algo objectid.Algorithm, offset uint64) (ent
 	case objecttype.TypeRefDelta:
 		baseID, err := objectid.FromBytes(algo, entry.RefBaseID)
 		if err != nil {
-			return zero, fmt.Errorf("objectstore/packed: pack %q invalid ref-delta base id: %w", pack.name, err)
+			return zero, fmt.Errorf("objectstorer/packed: pack %q invalid ref-delta base id: %w", pack.name, err)
 		}
 
 		meta.baseRefID = baseID
 	case objecttype.TypeOfsDelta:
 		if offset <= entry.OfsBaseDistance {
-			return zero, fmt.Errorf("objectstore/packed: pack %q has invalid ofs-delta base", pack.name)
+			return zero, fmt.Errorf("objectstorer/packed: pack %q has invalid ofs-delta base", pack.name)
 		}
 
 		meta.baseOfs = offset - entry.OfsBaseDistance
 	case objecttype.TypeCommit, objecttype.TypeTree, objecttype.TypeBlob, objecttype.TypeTag:
 		// Base object types do not have delta base metadata.
 	case objecttype.TypeInvalid, objecttype.TypeFuture:
-		return zero, fmt.Errorf("objectstore/packed: pack %q has unsupported entry type %d", pack.name, meta.ty)
+		return zero, fmt.Errorf("objectstorer/packed: pack %q has unsupported entry type %d", pack.name, meta.ty)
 	default:
-		return zero, fmt.Errorf("objectstore/packed: pack %q has unsupported entry type %d", pack.name, meta.ty)
+		return zero, fmt.Errorf("objectstorer/packed: pack %q has unsupported entry type %d", pack.name, meta.ty)
 	}
 
 	return meta, nil
diff --git a/object/store/packed/helpers_test.go b/object/storer/packed/helpers_test.go
index 2125185d..2d5e99a9 100644
--- a/object/store/packed/helpers_test.go
+++ b/object/storer/packed/helpers_test.go
@@ -10,7 +10,7 @@ import (
 	"codeberg.org/lindenii/furgit/internal/testgit"
 	objectheader "codeberg.org/lindenii/furgit/object/header"
 	objectid "codeberg.org/lindenii/furgit/object/id"
-	"codeberg.org/lindenii/furgit/object/store/packed"
+	"codeberg.org/lindenii/furgit/object/storer/packed"
 	objecttype "codeberg.org/lindenii/furgit/object/type"
 )
 
diff --git a/object/store/packed/idx.go b/object/storer/packed/idx.go
index 5024f2f3..5024f2f3 100644
--- a/object/store/packed/idx.go
+++ b/object/storer/packed/idx.go
diff --git a/object/store/packed/idx_candidates_mru.go b/object/storer/packed/idx_candidates_mru.go
index d0cc7052..d0cc7052 100644
--- a/object/store/packed/idx_candidates_mru.go
+++ b/object/storer/packed/idx_candidates_mru.go
diff --git a/object/store/packed/idx_close.go b/object/storer/packed/idx_close.go
index 814ec987..814ec987 100644
--- a/object/store/packed/idx_close.go
+++ b/object/storer/packed/idx_close.go
diff --git a/object/store/packed/idx_lookup.go b/object/storer/packed/idx_lookup.go
index 0bd11d1b..899a5acc 100644
--- a/object/store/packed/idx_lookup.go
+++ b/object/storer/packed/idx_lookup.go
@@ -11,14 +11,14 @@ import (
 // lookup resolves one object ID to its pack offset within this index.
 func (index *idxFile) lookup(id objectid.ObjectID) (uint64, bool, error) {
 	if id.Algorithm() != index.algo {
-		return 0, false, fmt.Errorf("objectstore/packed: object id algorithm mismatch")
+		return 0, false, fmt.Errorf("objectstorer/packed: object id algorithm mismatch")
 	}
 
 	idBytes := (&id).RawBytes()
 
 	hashSize := len(idBytes)
 	if hashSize != index.algo.Size() {
-		return 0, false, fmt.Errorf("objectstore/packed: unexpected object id length")
+		return 0, false, fmt.Errorf("objectstorer/packed: unexpected object id length")
 	}
 
 	first := int(idBytes[0])
@@ -30,7 +30,7 @@ func (index *idxFile) lookup(id objectid.ObjectID) (uint64, bool, error) {
 
 	hi := int(index.fanout[first])
 	if lo < 0 || hi < 0 || lo > hi || hi > index.numObjects {
-		return 0, false, fmt.Errorf("objectstore/packed: idx %q has invalid fanout bounds", index.idxName)
+		return 0, false, fmt.Errorf("objectstorer/packed: idx %q has invalid fanout bounds", index.idxName)
 	}
 
 	for lo < hi {
@@ -38,7 +38,7 @@ func (index *idxFile) lookup(id objectid.ObjectID) (uint64, bool, error) {
 
 		nameOffset := index.namesOffset + mid*hashSize
 		if nameOffset < 0 || nameOffset+hashSize > len(index.data) {
-			return 0, false, fmt.Errorf("objectstore/packed: idx %q truncated name table", index.idxName)
+			return 0, false, fmt.Errorf("objectstorer/packed: idx %q truncated name table", index.idxName)
 		}
 
 		cmp := bytes.Compare(index.data[nameOffset:nameOffset+hashSize], idBytes)
@@ -64,12 +64,12 @@ func (index *idxFile) lookup(id objectid.ObjectID) (uint64, bool, error) {
 // offsetAt resolves the pack offset for one object index entry.
 func (index *idxFile) offsetAt(objectIndex int) (uint64, error) {
 	if objectIndex < 0 || objectIndex >= index.numObjects {
-		return 0, fmt.Errorf("objectstore/packed: idx %q offset index out of bounds", index.idxName)
+		return 0, fmt.Errorf("objectstorer/packed: idx %q offset index out of bounds", index.idxName)
 	}
 
 	wordOffset := index.offset32Offset + objectIndex*4
 	if wordOffset < 0 || wordOffset+4 > len(index.data) {
-		return 0, fmt.Errorf("objectstore/packed: idx %q truncated 32-bit offset table", index.idxName)
+		return 0, fmt.Errorf("objectstorer/packed: idx %q truncated 32-bit offset table", index.idxName)
 	}
 
 	word := binary.BigEndian.Uint32(index.data[wordOffset : wordOffset+4])
@@ -79,12 +79,12 @@ func (index *idxFile) offsetAt(objectIndex int) (uint64, error) {
 
 	pos := int(word & 0x7fffffff)
 	if pos < 0 || pos >= index.offset64Count {
-		return 0, fmt.Errorf("objectstore/packed: idx %q invalid 64-bit offset position", index.idxName)
+		return 0, fmt.Errorf("objectstorer/packed: idx %q invalid 64-bit offset position", index.idxName)
 	}
 
 	offOffset := index.offset64Offset + pos*8
 	if offOffset < 0 || offOffset+8 > len(index.data)-2*index.algo.Size() {
-		return 0, fmt.Errorf("objectstore/packed: idx %q truncated 64-bit offset table", index.idxName)
+		return 0, fmt.Errorf("objectstorer/packed: idx %q truncated 64-bit offset table", index.idxName)
 	}
 
 	return binary.BigEndian.Uint64(index.data[offOffset : offOffset+8]), nil
diff --git a/object/store/packed/idx_lookup_candidates.go b/object/storer/packed/idx_lookup_candidates.go
index a2de262a..8946eb03 100644
--- a/object/store/packed/idx_lookup_candidates.go
+++ b/object/storer/packed/idx_lookup_candidates.go
@@ -97,7 +97,7 @@ func (store *Store) discoverCandidates() ([]packCandidate, error) {
 		packInfo, err := store.root.Stat(packName)
 		if err != nil {
 			if os.IsNotExist(err) {
-				return nil, fmt.Errorf("objectstore/packed: missing pack file for index %q", idxName)
+				return nil, fmt.Errorf("objectstorer/packed: missing pack file for index %q", idxName)
 			}
 
 			return nil, err
diff --git a/object/store/packed/idx_open.go b/object/storer/packed/idx_open.go
index fabd0c00..3e1d7d74 100644
--- a/object/store/packed/idx_open.go
+++ b/object/storer/packed/idx_open.go
@@ -62,7 +62,7 @@ func openIdxFile(root *os.Root, idxName, packName string, algo objectid.Algorith
 	if size < 0 || size > int64(int(^uint(0)>>1)) {
 		_ = file.Close()
 
-		return nil, fmt.Errorf("objectstore/packed: idx %q has unsupported size", idxName)
+		return nil, fmt.Errorf("objectstorer/packed: idx %q has unsupported size", idxName)
 	}
 
 	fd, err := intconv.UintptrToInt(file.Fd())
diff --git a/object/store/packed/idx_parse.go b/object/storer/packed/idx_parse.go
index 4da3bf42..128f01a2 100644
--- a/object/store/packed/idx_parse.go
+++ b/object/storer/packed/idx_parse.go
@@ -14,20 +14,20 @@ const (
 func (index *idxFile) parse() error {
 	hashSize := index.algo.Size()
 	if hashSize <= 0 {
-		return fmt.Errorf("objectstore/packed: idx %q has invalid hash algorithm", index.idxName)
+		return fmt.Errorf("objectstorer/packed: idx %q has invalid hash algorithm", index.idxName)
 	}
 
 	minLen := 8 + 256*4 + 2*hashSize
 	if len(index.data) < minLen {
-		return fmt.Errorf("objectstore/packed: idx %q too short", index.idxName)
+		return fmt.Errorf("objectstorer/packed: idx %q too short", index.idxName)
 	}
 
 	if binary.BigEndian.Uint32(index.data[:4]) != idxMagicV2 {
-		return fmt.Errorf("objectstore/packed: idx %q invalid magic", index.idxName)
+		return fmt.Errorf("objectstorer/packed: idx %q invalid magic", index.idxName)
 	}
 
 	if binary.BigEndian.Uint32(index.data[4:8]) != idxVersionV2 {
-		return fmt.Errorf("objectstore/packed: idx %q unsupported version", index.idxName)
+		return fmt.Errorf("objectstorer/packed: idx %q unsupported version", index.idxName)
 	}
 
 	prev := uint32(0)
@@ -37,7 +37,7 @@ func (index *idxFile) parse() error {
 
 		cur := binary.BigEndian.Uint32(index.data[base : base+4])
 		if cur < prev {
-			return fmt.Errorf("objectstore/packed: idx %q has non-monotonic fanout table", index.idxName)
+			return fmt.Errorf("objectstorer/packed: idx %q has non-monotonic fanout table", index.idxName)
 		}
 
 		index.fanout[i] = cur
@@ -46,7 +46,7 @@ func (index *idxFile) parse() error {
 
 	index.numObjects = int(index.fanout[255])
 	if index.numObjects < 0 {
-		return fmt.Errorf("objectstore/packed: idx %q has invalid object count", index.idxName)
+		return fmt.Errorf("objectstorer/packed: idx %q has invalid object count", index.idxName)
 	}
 
 	namesBytes := index.numObjects * hashSize
@@ -55,7 +55,7 @@ func (index *idxFile) parse() error {
 
 	minSize := 8 + 256*4 + namesBytes + crcBytes + offset32Bytes + 2*hashSize
 	if minSize < 0 || len(index.data) < minSize {
-		return fmt.Errorf("objectstore/packed: idx %q has truncated tables", index.idxName)
+		return fmt.Errorf("objectstorer/packed: idx %q has truncated tables", index.idxName)
 	}
 
 	index.namesOffset = 8 + 256*4
@@ -64,14 +64,14 @@ func (index *idxFile) parse() error {
 
 	offset64Bytes := len(index.data) - index.offset64Offset - 2*hashSize
 	if offset64Bytes < 0 || offset64Bytes%8 != 0 {
-		return fmt.Errorf("objectstore/packed: idx %q has malformed 64-bit offset table", index.idxName)
+		return fmt.Errorf("objectstorer/packed: idx %q has malformed 64-bit offset table", index.idxName)
 	}
 
 	index.offset64Count = offset64Bytes / 8
 
 	maxOffset64Count := max(index.numObjects-1, 0)
 	if index.offset64Count > maxOffset64Count {
-		return fmt.Errorf("objectstore/packed: idx %q has oversized 64-bit offset table", index.idxName)
+		return fmt.Errorf("objectstorer/packed: idx %q has oversized 64-bit offset table", index.idxName)
 	}
 
 	return nil
diff --git a/object/store/packed/location.go b/object/storer/packed/location.go
index 82d17c17..82d17c17 100644
--- a/object/store/packed/location.go
+++ b/object/storer/packed/location.go
diff --git a/object/store/packed/new.go b/object/storer/packed/new.go
index a4d1752d..cbfc9383 100644
--- a/object/store/packed/new.go
+++ b/object/storer/packed/new.go
@@ -16,7 +16,7 @@ func New(root *os.Root, algo objectid.Algorithm, opts Options) (*Store, error) {
 	switch opts.RefreshPolicy {
 	case RefreshPolicyOnMissing, RefreshPolicyNever:
 	default:
-		return nil, fmt.Errorf("objectstore/packed: invalid refresh policy %d", opts.RefreshPolicy)
+		return nil, fmt.Errorf("objectstorer/packed: invalid refresh policy %d", opts.RefreshPolicy)
 	}
 
 	return &Store{
diff --git a/object/store/packed/options.go b/object/storer/packed/options.go
index 05cbee30..05cbee30 100644
--- a/object/store/packed/options.go
+++ b/object/storer/packed/options.go
diff --git a/object/store/packed/pack.go b/object/storer/packed/pack.go
index c384d6a5..c8135d52 100644
--- a/object/store/packed/pack.go
+++ b/object/storer/packed/pack.go
@@ -23,11 +23,11 @@ type packFile struct {
 // openPackFile maps and validates one pack file.
 func openPackFile(name string, file *os.File, size int64) (*packFile, error) {
 	if size < 12 {
-		return nil, fmt.Errorf("objectstore/packed: pack %q too short", name)
+		return nil, fmt.Errorf("objectstorer/packed: pack %q too short", name)
 	}
 
 	if size > int64(int(^uint(0)>>1)) {
-		return nil, fmt.Errorf("objectstore/packed: pack %q has unsupported size", name)
+		return nil, fmt.Errorf("objectstorer/packed: pack %q has unsupported size", name)
 	}
 
 	fd, err := intconv.UintptrToInt(file.Fd())
@@ -43,14 +43,14 @@ func openPackFile(name string, file *os.File, size int64) (*packFile, error) {
 	if binary.BigEndian.Uint32(data[:4]) != packfmt.Signature {
 		_ = syscall.Munmap(data)
 
-		return nil, fmt.Errorf("objectstore/packed: pack %q invalid signature", name)
+		return nil, fmt.Errorf("objectstorer/packed: pack %q invalid signature", name)
 	}
 
 	version := binary.BigEndian.Uint32(data[4:8])
 	if !packfmt.VersionSupported(version) {
 		_ = syscall.Munmap(data)
 
-		return nil, fmt.Errorf("objectstore/packed: pack %q unsupported version %d", name, version)
+		return nil, fmt.Errorf("objectstorer/packed: pack %q unsupported version %d", name, version)
 	}
 
 	return &packFile{name: name, file: file, data: data}, nil
diff --git a/object/store/packed/pack_idx_checksum.go b/object/storer/packed/pack_idx_checksum.go
index 28d4c3db..81fd75ec 100644
--- a/object/store/packed/pack_idx_checksum.go
+++ b/object/storer/packed/pack_idx_checksum.go
@@ -16,18 +16,18 @@ func verifyMappedPackMatchesMappedIdx(packData, idxData []byte, algo objectid.Al
 	}
 
 	if len(packData) < hashSize {
-		return fmt.Errorf("objectstore/packed: pack too short for trailer hash")
+		return fmt.Errorf("objectstorer/packed: pack too short for trailer hash")
 	}
 
 	if len(idxData) < hashSize*2 {
-		return fmt.Errorf("objectstore/packed: idx too short for trailer hashes")
+		return fmt.Errorf("objectstorer/packed: idx too short for trailer hashes")
 	}
 
 	packTrailerHash := packData[len(packData)-hashSize:]
 
 	idxPackHash := idxData[len(idxData)-hashSize*2 : len(idxData)-hashSize]
 	if !bytes.Equal(packTrailerHash, idxPackHash) {
-		return fmt.Errorf("objectstore/packed: pack hash does not match idx")
+		return fmt.Errorf("objectstorer/packed: pack hash does not match idx")
 	}
 
 	return nil
diff --git a/object/store/packed/read_bytes.go b/object/storer/packed/read_bytes.go
index 333cfaae..6ed0585d 100644
--- a/object/store/packed/read_bytes.go
+++ b/object/storer/packed/read_bytes.go
@@ -27,7 +27,7 @@ func (store *Store) ReadBytesFull(id objectid.ObjectID) ([]byte, error) {
 
 	header, ok := objectheader.Encode(ty, int64(len(content)))
 	if !ok {
-		return nil, fmt.Errorf("objectstore/packed: failed to encode object header for type %d", ty)
+		return nil, fmt.Errorf("objectstorer/packed: failed to encode object header for type %d", ty)
 	}
 
 	out := make([]byte, len(header)+len(content))
diff --git a/object/store/packed/read_closer.go b/object/storer/packed/read_closer.go
index c317d002..c317d002 100644
--- a/object/store/packed/read_closer.go
+++ b/object/storer/packed/read_closer.go
diff --git a/object/store/packed/read_header.go b/object/storer/packed/read_header.go
index d774de7c..d774de7c 100644
--- a/object/store/packed/read_header.go
+++ b/object/storer/packed/read_header.go
diff --git a/object/store/packed/read_header_resolve.go b/object/storer/packed/read_header_resolve.go
index 6fee720a..285387fa 100644
--- a/object/store/packed/read_header_resolve.go
+++ b/object/storer/packed/read_header_resolve.go
@@ -15,7 +15,7 @@ func (store *Store) resolveHeaderAt(start location) (objecttype.Type, int64, err
 
 	for {
 		if _, ok := visited[current]; ok {
-			return objecttype.TypeInvalid, 0, fmt.Errorf("objectstore/packed: delta cycle while resolving object header")
+			return objecttype.TypeInvalid, 0, fmt.Errorf("objectstorer/packed: delta cycle while resolving object header")
 		}
 
 		visited[current] = struct{}{}
@@ -56,11 +56,11 @@ func (store *Store) resolveHeaderAt(start location) (objecttype.Type, int64, err
 				offset:   meta.baseOfs,
 			}
 		case objecttype.TypeCommit, objecttype.TypeTree, objecttype.TypeBlob, objecttype.TypeTag:
-			return objecttype.TypeInvalid, 0, fmt.Errorf("objectstore/packed: internal invariant violation for base type %d", meta.ty)
+			return objecttype.TypeInvalid, 0, fmt.Errorf("objectstorer/packed: internal invariant violation for base type %d", meta.ty)
 		case objecttype.TypeInvalid, objecttype.TypeFuture:
-			return objecttype.TypeInvalid, 0, fmt.Errorf("objectstore/packed: unsupported pack type %d", meta.ty)
+			return objecttype.TypeInvalid, 0, fmt.Errorf("objectstorer/packed: unsupported pack type %d", meta.ty)
 		default:
-			return objecttype.TypeInvalid, 0, fmt.Errorf("objectstore/packed: unsupported pack type %d", meta.ty)
+			return objecttype.TypeInvalid, 0, fmt.Errorf("objectstorer/packed: unsupported pack type %d", meta.ty)
 		}
 	}
 }
diff --git a/object/store/packed/read_reader.go b/object/storer/packed/read_reader.go
index 5f4fa604..324ee033 100644
--- a/object/store/packed/read_reader.go
+++ b/object/storer/packed/read_reader.go
@@ -80,7 +80,7 @@ func (store *Store) ReadReaderFull(id objectid.ObjectID) (io.ReadCloser, error)
 	if packfmt.IsBaseObjectType(meta.ty) {
 		header, ok := objectheader.Encode(meta.ty, meta.size)
 		if !ok {
-			return nil, fmt.Errorf("objectstore/packed: failed to encode object header for type %d", meta.ty)
+			return nil, fmt.Errorf("objectstorer/packed: failed to encode object header for type %d", meta.ty)
 		}
 
 		zr, err := zlibReaderAt(pack, meta.dataOffset)
diff --git a/object/store/packed/read_size.go b/object/storer/packed/read_size.go
index 3036abcd..9d6c8e7d 100644
--- a/object/store/packed/read_size.go
+++ b/object/storer/packed/read_size.go
@@ -37,10 +37,10 @@ func (store *Store) resolveSizeAt(start location) (int64, error) {
 	case objecttype.TypeRefDelta, objecttype.TypeOfsDelta:
 		return deltaDeclaredSizeAt(pack, meta.dataOffset)
 	case objecttype.TypeInvalid, objecttype.TypeFuture:
-		return 0, fmt.Errorf("objectstore/packed: unsupported pack type %d", meta.ty)
+		return 0, fmt.Errorf("objectstorer/packed: unsupported pack type %d", meta.ty)
 	case objecttype.TypeCommit, objecttype.TypeTree, objecttype.TypeBlob, objecttype.TypeTag:
-		return 0, fmt.Errorf("objectstore/packed: internal invariant violation for base type %d", meta.ty)
+		return 0, fmt.Errorf("objectstorer/packed: internal invariant violation for base type %d", meta.ty)
 	default:
-		return 0, fmt.Errorf("objectstore/packed: unsupported pack type %d", meta.ty)
+		return 0, fmt.Errorf("objectstorer/packed: unsupported pack type %d", meta.ty)
 	}
 }
diff --git a/object/store/packed/read_test.go b/object/storer/packed/read_test.go
index e690a8fd..4686d192 100644
--- a/object/store/packed/read_test.go
+++ b/object/storer/packed/read_test.go
@@ -11,8 +11,8 @@ import (
 
 	"codeberg.org/lindenii/furgit/internal/testgit"
 	objectid "codeberg.org/lindenii/furgit/object/id"
-	"codeberg.org/lindenii/furgit/object/store"
-	"codeberg.org/lindenii/furgit/object/store/packed"
+	"codeberg.org/lindenii/furgit/object/storer"
+	"codeberg.org/lindenii/furgit/object/storer/packed"
 )
 
 func TestPackedStoreReadAgainstGit(t *testing.T) {
@@ -113,32 +113,32 @@ func TestPackedStoreErrors(t *testing.T) {
 		}
 
 		_, err = store.ReadBytesFull(notFoundID)
-		if !errors.Is(err, objectstore.ErrObjectNotFound) {
+		if !errors.Is(err, objectstorer.ErrObjectNotFound) {
 			t.Fatalf("ReadBytesFull not-found error = %v", err)
 		}
 
 		_, _, err = store.ReadBytesContent(notFoundID)
-		if !errors.Is(err, objectstore.ErrObjectNotFound) {
+		if !errors.Is(err, objectstorer.ErrObjectNotFound) {
 			t.Fatalf("ReadBytesContent not-found error = %v", err)
 		}
 
 		_, err = store.ReadReaderFull(notFoundID)
-		if !errors.Is(err, objectstore.ErrObjectNotFound) {
+		if !errors.Is(err, objectstorer.ErrObjectNotFound) {
 			t.Fatalf("ReadReaderFull not-found error = %v", err)
 		}
 
 		_, _, _, err = store.ReadReaderContent(notFoundID)
-		if !errors.Is(err, objectstore.ErrObjectNotFound) {
+		if !errors.Is(err, objectstorer.ErrObjectNotFound) {
 			t.Fatalf("ReadReaderContent not-found error = %v", err)
 		}
 
 		_, _, err = store.ReadHeader(notFoundID)
-		if !errors.Is(err, objectstore.ErrObjectNotFound) {
+		if !errors.Is(err, objectstorer.ErrObjectNotFound) {
 			t.Fatalf("ReadHeader not-found error = %v", err)
 		}
 
 		_, err = store.ReadSize(notFoundID)
-		if !errors.Is(err, objectstore.ErrObjectNotFound) {
+		if !errors.Is(err, objectstorer.ErrObjectNotFound) {
 			t.Fatalf("ReadSize not-found error = %v", err)
 		}
 
diff --git a/object/store/packed/store.go b/object/storer/packed/store.go
index bb83456a..a95bedd7 100644
--- a/object/store/packed/store.go
+++ b/object/storer/packed/store.go
@@ -7,7 +7,7 @@ import (
 	"sync/atomic"
 
 	objectid "codeberg.org/lindenii/furgit/object/id"
-	"codeberg.org/lindenii/furgit/object/store"
+	"codeberg.org/lindenii/furgit/object/storer"
 )
 
 // Store reads Git objects from pack/index files under an objects/pack root.
@@ -48,4 +48,4 @@ type Store struct {
 	deltaCache *deltaCache
 }
 
-var _ objectstore.Store = (*Store)(nil)
+var _ objectstorer.Store = (*Store)(nil)
diff --git a/object/store/packed/store_lookup.go b/object/storer/packed/store_lookup.go
index 882a8888..3985463b 100644
--- a/object/store/packed/store_lookup.go
+++ b/object/storer/packed/store_lookup.go
@@ -4,14 +4,14 @@ import (
 	"errors"
 
 	objectid "codeberg.org/lindenii/furgit/object/id"
-	"codeberg.org/lindenii/furgit/object/store"
+	"codeberg.org/lindenii/furgit/object/storer"
 )
 
 // lookup resolves one object ID to its pack location.
 func (store *Store) lookup(id objectid.ObjectID) (location, error) {
 	var zero location
 	if id.Algorithm() != store.algo {
-		return zero, errors.New("objectstore/packed: object id algorithm mismatch")
+		return zero, errors.New("objectstorer/packed: object id algorithm mismatch")
 	}
 
 	snapshot, err := store.ensureCandidates()
@@ -47,7 +47,7 @@ func (store *Store) lookup(id objectid.ObjectID) (location, error) {
 		}
 	}
 
-	return zero, objectstore.ErrObjectNotFound
+	return zero, objectstorer.ErrObjectNotFound
 }
 
 func (store *Store) lookupInCandidates(
diff --git a/object/store/packed/store_open_pack.go b/object/storer/packed/store_open_pack.go
index c621e08c..c621e08c 100644
--- a/object/store/packed/store_open_pack.go
+++ b/object/storer/packed/store_open_pack.go
diff --git a/object/store/packed/trailer_match.go b/object/storer/packed/trailer_match.go
index dc43e37d..baf9316a 100644
--- a/object/store/packed/trailer_match.go
+++ b/object/storer/packed/trailer_match.go
@@ -12,7 +12,7 @@ func (store *Store) verifyPackMatchesIndexes(pack *packFile) error {
 
 	candidate, ok := snapshot.candidateByPack[pack.name]
 	if !ok {
-		return fmt.Errorf("objectstore/packed: missing index for pack %q", pack.name)
+		return fmt.Errorf("objectstorer/packed: missing index for pack %q", pack.name)
 	}
 
 	index, err := store.openIndex(candidate)
@@ -22,7 +22,7 @@ func (store *Store) verifyPackMatchesIndexes(pack *packFile) error {
 
 	err = verifyMappedPackMatchesMappedIdx(pack.data, index.data, store.algo)
 	if err != nil {
-		return fmt.Errorf("objectstore/packed: pack %q does not match idx %q: %w", pack.name, index.idxName, err)
+		return fmt.Errorf("objectstorer/packed: pack %q does not match idx %q: %w", pack.name, index.idxName, err)
 	}
 
 	return nil