diff --git a/cmd/ghcs/logs.go b/cmd/ghcs/logs.go
index 34685e1e8..829ba9a31 100644
--- a/cmd/ghcs/logs.go
+++ b/cmd/ghcs/logs.go
@@ -88,7 +88,7 @@ func logs(ctx context.Context, tail bool, codespaceName string) error {
 
 	tunnelClosed := make(chan error, 1)
 	go func() {
-		tunnelClosed <- tunnel.Start(ctx) // error is non-nil
+		tunnelClosed <- tunnel.Forward(ctx) // error is non-nil
 	}()
 
 	cmdDone := make(chan error, 1)
diff --git a/cmd/ghcs/ports.go b/cmd/ghcs/ports.go
index f83757ff8..695c4e491 100644
--- a/cmd/ghcs/ports.go
+++ b/cmd/ghcs/ports.go
@@ -307,7 +307,7 @@ func forwardPorts(log *output.Logger, codespaceName string, ports []string) erro
 		g.Go(func() error {
 			log.Println("Forwarding port: " + srcstr + " ==> " + strconv.Itoa(pp.dst))
 			portForwarder := liveshare.NewPortForwarder(lsclient, server, pp.dst)
-			if err := portForwarder.Start(gctx); err != nil {
+			if err := portForwarder.Forward(gctx); err != nil {
 				return fmt.Errorf("error forwarding port: %v", err)
 			}
 
diff --git a/cmd/ghcs/ssh.go b/cmd/ghcs/ssh.go
index aa85c33a3..c6d150360 100644
--- a/cmd/ghcs/ssh.go
+++ b/cmd/ghcs/ssh.go
@@ -105,7 +105,7 @@ func ssh(ctx context.Context, sshProfile, codespaceName string, localSSHServerPo
 
 	tunnelClosed := make(chan error)
 	go func() {
-		tunnelClosed <- tunnel.Start(ctx) // error is always non-nil
+		tunnelClosed <- tunnel.Forward(ctx) // error is always non-nil
 	}()
 
 	shellClosed := make(chan error)
diff --git a/internal/codespaces/states.go b/internal/codespaces/states.go
index a58e2b235..5a5d72d6c 100644
--- a/internal/codespaces/states.go
+++ b/internal/codespaces/states.go
@@ -62,7 +62,7 @@ func PollPostCreateStates(ctx context.Context, log logger, apiClient *api.API, u
 
 	tunnelClosed := make(chan error, 1) // buffered to avoid sender stuckness
 	go func() {
-		tunnelClosed <- fwd.Start(ctx) // error is non-nil
+		tunnelClosed <- fwd.Forward(ctx) // error is non-nil
 	}()
 
 	t := time.NewTicker(1 * time.Second)