diff --git a/badgern/count.go b/badger/count.go
similarity index 92%
rename from badgern/count.go
rename to badger/count.go
index 85b4019..a9d4dd0 100644
--- a/badgern/count.go
+++ b/badger/count.go
@@ -1,4 +1,4 @@
-package badgern
+package badger
 
 import (
 	"context"
@@ -6,7 +6,7 @@ import (
 
 	"github.com/dgraph-io/badger/v4"
 	"github.com/nbd-wtf/go-nostr"
-	"github.com/nbd-wtf/go-nostr/nson"
+	nostr_binary "github.com/nbd-wtf/go-nostr/binary"
 )
 
 func (b BadgerBackend) CountEvents(ctx context.Context, filter nostr.Filter) (int64, error) {
@@ -58,7 +58,7 @@ func (b BadgerBackend) CountEvents(ctx context.Context, filter nostr.Filter) (in
 				} else {
 					err = item.Value(func(val []byte) error {
 						evt := &nostr.Event{}
-						if err := nson.Unmarshal(string(val), evt); err != nil {
+						if err := nostr_binary.Unmarshal(val, evt); err != nil {
 							return err
 						}
 
diff --git a/badgern/delete.go b/badger/delete.go
similarity index 92%
rename from badgern/delete.go
rename to badger/delete.go
index d31b920..8c8b83d 100644
--- a/badgern/delete.go
+++ b/badger/delete.go
@@ -1,4 +1,4 @@
-package badgern
+package badger
 
 import (
 	"context"
@@ -6,7 +6,7 @@ import (
 
 	"github.com/dgraph-io/badger/v4"
 	"github.com/nbd-wtf/go-nostr"
-	"github.com/nbd-wtf/go-nostr/nson"
+	nostr_binary "github.com/nbd-wtf/go-nostr/binary"
 )
 
 func (b *BadgerBackend) DeleteEvent(ctx context.Context, evt *nostr.Event) error {
@@ -43,7 +43,7 @@ func (b *BadgerBackend) DeleteEvent(ctx context.Context, evt *nostr.Event) error
 
 		item.Value(func(val []byte) error {
 			evt := &nostr.Event{}
-			if err := nson.Unmarshal(string(val), evt); err != nil {
+			if err := nostr_binary.Unmarshal(val, evt); err != nil {
 				return err
 			}
 
diff --git a/badgern/lib.go b/badger/lib.go
similarity index 99%
rename from badgern/lib.go
rename to badger/lib.go
index 67ce14a..67d3db8 100644
--- a/badgern/lib.go
+++ b/badger/lib.go
@@ -1,4 +1,4 @@
-package badgern
+package badger
 
 import (
 	"encoding/binary"
diff --git a/badgern/query.go b/badger/query.go
similarity index 98%
rename from badgern/query.go
rename to badger/query.go
index 1e5c692..262e7f0 100644
--- a/badgern/query.go
+++ b/badger/query.go
@@ -1,4 +1,4 @@
-package badgern
+package badger
 
 import (
 	"container/heap"
@@ -9,7 +9,7 @@ import (
 
 	"github.com/dgraph-io/badger/v4"
 	"github.com/nbd-wtf/go-nostr"
-	"github.com/nbd-wtf/go-nostr/nson"
+	nostr_binary "github.com/nbd-wtf/go-nostr/binary"
 )
 
 type query struct {
@@ -75,7 +75,7 @@ func (b BadgerBackend) QueryEvents(ctx context.Context, filter nostr.Filter) (ch
 						}
 						err = item.Value(func(val []byte) error {
 							evt := &nostr.Event{}
-							if err := nson.Unmarshal(string(val), evt); err != nil {
+							if err := nostr_binary.Unmarshal(val, evt); err != nil {
 								return err
 							}
 
diff --git a/badgern/save.go b/badger/save.go
similarity index 75%
rename from badgern/save.go
rename to badger/save.go
index b8d2cb8..a2737c5 100644
--- a/badgern/save.go
+++ b/badger/save.go
@@ -1,23 +1,23 @@
-package badgern
+package badger
 
 import (
 	"context"
 
 	"github.com/dgraph-io/badger/v4"
 	"github.com/nbd-wtf/go-nostr"
-	"github.com/nbd-wtf/go-nostr/nson"
+	nostr_binary "github.com/nbd-wtf/go-nostr/binary"
 )
 
 func (b *BadgerBackend) SaveEvent(ctx context.Context, evt *nostr.Event) error {
 	return b.Update(func(txn *badger.Txn) error {
-		nson, err := nson.Marshal(evt)
+		bin, err := nostr_binary.Marshal(evt)
 		if err != nil {
 			return err
 		}
 
 		idx := b.Serial()
 		// raw event store
-		if err := txn.Set(idx, []byte(nson)); err != nil {
+		if err := txn.Set(idx, bin); err != nil {
 			return err
 		}
 
diff --git a/lmdbn/count.go b/lmdb/count.go
similarity index 94%
rename from lmdbn/count.go
rename to lmdb/count.go
index 9862267..8e4774a 100644
--- a/lmdbn/count.go
+++ b/lmdb/count.go
@@ -1,4 +1,4 @@
-package lmdbn
+package lmdb
 
 import (
 	"bytes"
@@ -7,7 +7,7 @@ import (
 
 	"github.com/bmatsuo/lmdb-go/lmdb"
 	"github.com/nbd-wtf/go-nostr"
-	"github.com/nbd-wtf/go-nostr/nson"
+	nostr_binary "github.com/nbd-wtf/go-nostr/binary"
 )
 
 func (b *LMDBBackend) CountEvents(ctx context.Context, filter nostr.Filter) (int64, error) {
@@ -67,7 +67,7 @@ func (b *LMDBBackend) CountEvents(ctx context.Context, filter nostr.Filter) (int
 					count++
 				} else {
 					evt := &nostr.Event{}
-					if err := nson.Unmarshal(string(val), evt); err != nil {
+					if err := nostr_binary.Unmarshal(val, evt); err != nil {
 						return err
 					}
 
diff --git a/lmdbn/delete.go b/lmdb/delete.go
similarity index 88%
rename from lmdbn/delete.go
rename to lmdb/delete.go
index 69cc54e..d9b4dd3 100644
--- a/lmdbn/delete.go
+++ b/lmdb/delete.go
@@ -1,4 +1,4 @@
-package lmdbn
+package lmdb
 
 import (
 	"context"
@@ -6,7 +6,7 @@ import (
 
 	"github.com/bmatsuo/lmdb-go/lmdb"
 	"github.com/nbd-wtf/go-nostr"
-	"github.com/nbd-wtf/go-nostr/nson"
+	nostr_binary "github.com/nbd-wtf/go-nostr/binary"
 )
 
 func (b *LMDBBackend) DeleteEvent(ctx context.Context, evt *nostr.Event) error {
@@ -28,7 +28,7 @@ func (b *LMDBBackend) DeleteEvent(ctx context.Context, evt *nostr.Event) error {
 		}
 
 		evt := &nostr.Event{}
-		if err := nson.Unmarshal(string(val), evt); err != nil {
+		if err := nostr_binary.Unmarshal(val, evt); err != nil {
 			return err
 		}
 
diff --git a/lmdbn/lib.go b/lmdb/lib.go
similarity index 99%
rename from lmdbn/lib.go
rename to lmdb/lib.go
index 59a5107..26d9faa 100644
--- a/lmdbn/lib.go
+++ b/lmdb/lib.go
@@ -1,4 +1,4 @@
-package lmdbn
+package lmdb
 
 import (
 	"encoding/binary"
diff --git a/lmdbn/query.go b/lmdb/query.go
similarity index 98%
rename from lmdbn/query.go
rename to lmdb/query.go
index 04a1cf7..8157971 100644
--- a/lmdbn/query.go
+++ b/lmdb/query.go
@@ -1,4 +1,4 @@
-package lmdbn
+package lmdb
 
 import (
 	"bytes"
@@ -10,7 +10,7 @@ import (
 
 	"github.com/bmatsuo/lmdb-go/lmdb"
 	"github.com/nbd-wtf/go-nostr"
-	"github.com/nbd-wtf/go-nostr/nson"
+	nostr_binary "github.com/nbd-wtf/go-nostr/binary"
 )
 
 type query struct {
@@ -92,7 +92,7 @@ func (b *LMDBBackend) QueryEvents(ctx context.Context, filter nostr.Filter) (cha
 						}
 
 						evt := &nostr.Event{}
-						if err := nson.Unmarshal(string(val), evt); err != nil {
+						if err := nostr_binary.Unmarshal(val, evt); err != nil {
 							panic(err)
 						}
 
diff --git a/lmdbn/save.go b/lmdb/save.go
similarity index 78%
rename from lmdbn/save.go
rename to lmdb/save.go
index 427bd87..9eb9f4b 100644
--- a/lmdbn/save.go
+++ b/lmdb/save.go
@@ -1,4 +1,4 @@
-package lmdbn
+package lmdb
 
 import (
 	"context"
@@ -6,7 +6,7 @@ import (
 
 	"github.com/bmatsuo/lmdb-go/lmdb"
 	"github.com/nbd-wtf/go-nostr"
-	"github.com/nbd-wtf/go-nostr/nson"
+	nostr_binary "github.com/nbd-wtf/go-nostr/binary"
 )
 
 func (b *LMDBBackend) SaveEvent(ctx context.Context, evt *nostr.Event) error {
@@ -16,14 +16,14 @@ func (b *LMDBBackend) SaveEvent(ctx context.Context, evt *nostr.Event) error {
 	}
 
 	return b.lmdbEnv.Update(func(txn *lmdb.Txn) error {
-		nson, err := nson.Marshal(evt)
+		bin, err := nostr_binary.Marshal(evt)
 		if err != nil {
 			return err
 		}
 
 		idx := b.Serial()
 		// raw event store
-		if err := txn.Put(b.rawEventStore, idx, []byte(nson), 0); err != nil {
+		if err := txn.Put(b.rawEventStore, idx, bin, 0); err != nil {
 			return err
 		}