diff --git a/server.go b/server.go
index a3e5ab5..2393d42 100644
--- a/server.go
+++ b/server.go
@@ -170,7 +170,7 @@ type Server struct {
 	utilStore       Store
 	pluginStore     Store
 	skillStore      Store
-	sessionStore    *SessionManager
+	sessionMgr    *SessionManager
 	transcriptStore Store
 	tmpStore        Store
 	rootStore       *store.DirStore
@@ -215,7 +215,7 @@ func New(sink *olog.Sink, opts ...ServerOption) *Server {
 	for _, o := range opts {
 		o(s)
 	}
-	s.sessionStore = store.NewSessionManager(store.SessionManagerConfig{
+	s.sessionMgr = store.NewSessionManager(store.SessionManagerConfig{
 		AgentsDir:   agentsDir,
 		SessionsDir: sessionsDir,
 		Log:         s.log,
@@ -262,7 +262,7 @@ func (s *Server) storeRoutes() []storeRoute {
 		{"/a/", func() Store { return s.agentStore }},
 		{"/p/", func() Store { return s.promptStore }},
 		{"/m/", func() Store { return s.memStore }},
-		{"/s/", func() Store { return s.sessionStore.Store() }},
+		{"/s/", func() Store { return s.sessionMgr.Store() }},
 		{"/sk/", func() Store { return s.skillStore }},
 		{"/u/", func() Store { return s.utilStore }},
 		{"/x/", func() Store { return s.pluginStore }},
@@ -343,7 +343,7 @@ func (s *Server) fileOwnerGroup(path string) (uid, gid string) {
 	if strings.HasPrefix(path, "/s/") {
 		parts := strings.SplitN(strings.TrimPrefix(path, "/s/"), "/", 2)
 		if len(parts) >= 1 && parts[0] != "new" && !isSessionManagerFile(path) {
-			if sess := s.sessionStore.Session(parts[0]); sess != nil {
+			if sess := s.sessionMgr.Session(parts[0]); sess != nil {
 				return sess.Uname(), "agent"
 			}
 		}
@@ -646,7 +646,7 @@ func (s *Server) attach(cs *connState, fc *plan9.Fcall) *plan9.Fcall {
 	s.log.Debug("Tattach uname=%q", fc.Uname)
 	// Assign group membership based on whether uname is a session principal.
 	if fc.Uname != "" {
-		if s.sessionStore.SessionByUname(fc.Uname) != nil {
+		if s.sessionMgr.SessionByUname(fc.Uname) != nil {
 			s.AddGroup("agent", fc.Uname)
 		} else {
 			s.AddGroup("user", fc.Uname)
@@ -1038,12 +1038,12 @@ func (s *Server) handleWrite(path, input, uname string) error {
 
 // Shutdown kills all active sessions and batch jobs.
 func (s *Server) Shutdown() {
-	s.sessionStore.Shutdown()
+	s.sessionMgr.Shutdown()
 }
 
 // InterruptAll cancels any in-progress agent turn on every active session.
 func (s *Server) InterruptAll() {
-	s.sessionStore.InterruptAll()
+	s.sessionMgr.InterruptAll()
 }
 
 // readDir serializes directory entries for the given path, respecting offset and count.
@@ -1222,7 +1222,7 @@ func (s *Server) makeStat(path string) plan9.Dir {
 	if strings.HasPrefix(path, "/s/") {
 		parts := strings.SplitN(strings.TrimPrefix(path, "/"), "/", 3)
 		if len(parts) == 3 && parts[0] == "s" {
-			if sess := s.sessionStore.Session(parts[1]); sess != nil {
+			if sess := s.sessionMgr.Session(parts[1]); sess != nil {
 				if base == "chat" {
 					length, vers := sess.LogInfo()
 					dir.Length = uint64(length)
@@ -1246,7 +1246,7 @@ func (s *Server) makeStat(path string) plan9.Dir {
 	if dir.Length == 0 && !isDir {
 		switch {
 		case isSessionManagerFile(path):
-			if content, err := storeRead(s.sessionStore.Store(), base); err == nil {
+			if content, err := storeRead(s.sessionMgr.Store(), base); err == nil {
 				dir.Length = uint64(len(content))
 			}
 		case path == "/backends":
@@ -1296,7 +1296,7 @@ func (s *Server) makeStat(path string) plan9.Dir {
 			}
 		case strings.HasPrefix(path, "/s/"):
 			name := strings.TrimPrefix(path, "/s/")
-			if info, err := s.sessionStore.Store().Stat(name); err == nil {
+			if info, err := s.sessionMgr.Store().Stat(name); err == nil {
 				dir.Length = uint64(info.Size())
 			}
 		}