diff --git a/session/create.go b/session/create.go
index d0818a0..ddbbc78 100644
--- a/session/create.go
+++ b/session/create.go
@@ -206,7 +206,7 @@ func (s *Manager) CreateSession(args []string) (string, error) {
 			AgentsDir:      s.cfg.AgentsDir,
 			SessionsDir:    s.cfg.SessionsDir,
 			SessionID:      sessID,
-			Uname:          uname,
+			AgentID:          uname,
 			CWD:            cwd,
 			Remote:         remoteTarget,
 			Runtime:        rt,
diff --git a/session/persist.go b/session/persist.go
index 539b906..d1ab3eb 100644
--- a/session/persist.go
+++ b/session/persist.go
@@ -215,7 +215,7 @@ func (s *Manager) restoreSession(ps *agent.PersistedSession) error {
 		AgentsDir:      s.cfg.AgentsDir,
 		SessionsDir:    s.cfg.SessionsDir,
 		SessionID:      sessID,
-		Uname:          uname,
+		AgentID:          uname,
 		CWD:            cwd,
 		Remote:         remoteTarget,
 		History:        restoredSession,