diff --git a/examples/demo/etc/etc.go b/examples/demo/etc/etc.go
index 5b44d86..f3c9fd3 100644
--- a/examples/demo/etc/etc.go
+++ b/examples/demo/etc/etc.go
@@ -7,7 +7,7 @@ import (
 	"git.sr.ht/~cco/go-scopes/core/action"
 	"git.sr.ht/~cco/go-scopes/logging"
 	"git.sr.ht/~cco/go-scopes/server"
-	"git.sr.ht/~cco/go-scopes/storage/msgstore"
+	msgstore "git.sr.ht/~cco/go-scopes/storage/message"
 	"git.sr.ht/~cco/go-scopes/storage/sql"
 )
 
diff --git a/forge/forge.go b/forge/forge.go
index fc2283e..7f0cea5 100644
--- a/forge/forge.go
+++ b/forge/forge.go
@@ -1,4 +1,4 @@
-// Package forge implements a stack-based interpreter.
+// Package `forge` implements a stack-based interpreter.
 package forge
 
 import (
diff --git a/storage/msgstore/msgstore.go b/storage/message/message.go
similarity index 97%
rename from storage/msgstore/msgstore.go
rename to storage/message/message.go
index f1658ef..f7f4548 100644
--- a/storage/msgstore/msgstore.go
+++ b/storage/message/message.go
@@ -1,4 +1,4 @@
-package msgstore
+package message
 
 import (
 	lib "git.sr.ht/~cco/go-scopes"
diff --git a/storage/msgstore/sql/tables_pg.sql b/storage/message/sql/tables_pg.sql
similarity index 100%
rename from storage/msgstore/sql/tables_pg.sql
rename to storage/message/sql/tables_pg.sql
diff --git a/storage/msgstore/sql/tables_sqlite.sql b/storage/message/sql/tables_sqlite.sql
similarity index 100%
rename from storage/msgstore/sql/tables_sqlite.sql
rename to storage/message/sql/tables_sqlite.sql
diff --git a/tests/storage_test.go b/tests/storage_test.go
index ca1d89a..0e69fc7 100644
--- a/tests/storage_test.go
+++ b/tests/storage_test.go
@@ -5,7 +5,7 @@ import (
 
 	"git.sr.ht/~cco/go-scopes/common/testing"
 	"git.sr.ht/~cco/go-scopes/core/message"
-	"git.sr.ht/~cco/go-scopes/storage/msgstore"
+	msgstore "git.sr.ht/~cco/go-scopes/storage/message"
 	"git.sr.ht/~cco/go-scopes/storage/sql"
 	_ "git.sr.ht/~cco/go-scopes/storage/sql/pgsql"
 	_ "git.sr.ht/~cco/go-scopes/storage/sql/sqlite"
@@ -30,7 +30,7 @@ func TestPgsql(tb *tbase.T) {
 
 func DoTests(t *testing.T, cfg *sql.Cfg, db *sql.Storage) {
 	t.Run("base", func(t *testing.T) { BaseTest(t, cfg, db) })
-	t.Run("msgstore", func(t *testing.T) { MsgstoreTest(t, cfg, db) })
+	t.Run("message", func(t *testing.T) { MsgstoreTest(t, cfg, db) })
 }
 
 type greet struct {