diff --git a/internal/codespaces/states.go b/internal/codespaces/states.go
index ca5ae49e7..688fd063f 100644
--- a/internal/codespaces/states.go
+++ b/internal/codespaces/states.go
@@ -43,7 +43,7 @@ func PollPostCreateStates(ctx context.Context, progress progressIndicator, apiCl
 
 	session, err := ConnectToLiveshare(ctx, progress, noopLogger, apiClient, codespace)
 	if err != nil {
-		return fmt.Errorf("connect to Live Share: %w", err)
+		return fmt.Errorf("connect to codespace: %w", err)
 	}
 	defer func() {
 		if closeErr := session.Close(); err == nil {
diff --git a/pkg/cmd/codespace/logs.go b/pkg/cmd/codespace/logs.go
index c42ef42d7..9fc6010b4 100644
--- a/pkg/cmd/codespace/logs.go
+++ b/pkg/cmd/codespace/logs.go
@@ -53,7 +53,7 @@ func (a *App) Logs(ctx context.Context, codespaceName string, follow bool) (err
 
 	session, err := codespaces.ConnectToLiveshare(ctx, a, noopLogger(), a.apiClient, codespace)
 	if err != nil {
-		return fmt.Errorf("connecting to Live Share: %w", err)
+		return fmt.Errorf("connecting to codespace: %w", err)
 	}
 	defer safeClose(session, &err)
 
diff --git a/pkg/cmd/codespace/ports.go b/pkg/cmd/codespace/ports.go
index ff07b059c..094833e30 100644
--- a/pkg/cmd/codespace/ports.go
+++ b/pkg/cmd/codespace/ports.go
@@ -59,7 +59,7 @@ func (a *App) ListPorts(ctx context.Context, codespaceName string, exporter cmdu
 
 	session, err := codespaces.ConnectToLiveshare(ctx, a, noopLogger(), a.apiClient, codespace)
 	if err != nil {
-		return fmt.Errorf("error connecting to Live Share: %w", err)
+		return fmt.Errorf("error connecting to codespace: %w", err)
 	}
 	defer safeClose(session, &err)
 
@@ -245,7 +245,7 @@ func (a *App) UpdatePortVisibility(ctx context.Context, codespaceName string, ar
 
 	session, err := codespaces.ConnectToLiveshare(ctx, a, noopLogger(), a.apiClient, codespace)
 	if err != nil {
-		return fmt.Errorf("error connecting to Live Share: %w", err)
+		return fmt.Errorf("error connecting to codespace: %w", err)
 	}
 	defer safeClose(session, &err)
 
@@ -321,7 +321,7 @@ func (a *App) ForwardPorts(ctx context.Context, codespaceName string, ports []st
 
 	session, err := codespaces.ConnectToLiveshare(ctx, a, noopLogger(), a.apiClient, codespace)
 	if err != nil {
-		return fmt.Errorf("error connecting to Live Share: %w", err)
+		return fmt.Errorf("error connecting to codespace: %w", err)
 	}
 	defer safeClose(session, &err)
 
diff --git a/pkg/cmd/codespace/ssh.go b/pkg/cmd/codespace/ssh.go
index 9c0ae7f1b..6b813a8f1 100644
--- a/pkg/cmd/codespace/ssh.go
+++ b/pkg/cmd/codespace/ssh.go
@@ -85,7 +85,7 @@ func (a *App) SSH(ctx context.Context, sshArgs []string, opts sshOptions) (err e
 
 	session, err := codespaces.ConnectToLiveshare(ctx, a, liveshareLogger, a.apiClient, codespace)
 	if err != nil {
-		return fmt.Errorf("error connecting to Live Share: %w", err)
+		return fmt.Errorf("error connecting to codespace: %w", err)
 	}
 	defer safeClose(session, &err)