diff --git a/cli/azd/internal/vsrpc/environment_service.go b/cli/azd/internal/vsrpc/environment_service.go
index b14d1aeb887..11fd301eeea 100644
--- a/cli/azd/internal/vsrpc/environment_service.go
+++ b/cli/azd/internal/vsrpc/environment_service.go
@@ -43,11 +43,11 @@ func (s *environmentService) GetEnvironmentsAsync(
 		envManager environment.Manager `container:"type"`
 	}
 
-	container, err := session.newContainer(rc)
+	serverContainer, err := session.newContainer(rc)
 	if err != nil {
 		return nil, err
 	}
-	if err := container.Fill(ctx, &c); err != nil {
+	if err := serverContainer.Fill(ctx, &c); err != nil {
 		return nil, err
 	}
 
@@ -82,11 +82,11 @@ func (s *environmentService) SetCurrentEnvironmentAsync(
 		azdCtx *azdcontext.AzdContext `container:"type"`
 	}
 
-	container, err := session.newContainer(rc)
+	serverContainer, err := session.newContainer(rc)
 	if err != nil {
 		return false, err
 	}
-	if err := container.Fill(ctx, &c); err != nil {
+	if err := serverContainer.Fill(ctx, &c); err != nil {
 		return false, err
 	}
 
@@ -155,7 +155,7 @@ func (s *environmentService) DeleteEnvironmentAsync(
 		}
 	})
 
-	if err := container.Fill(ctx, &c); err != nil {
+	if err := serverContainer.Fill(ctx, &c); err != nil {
 		return false, err
 	}
 
diff --git a/cli/azd/internal/vsrpc/environment_service_create.go b/cli/azd/internal/vsrpc/environment_service_create.go
index 47c93dd1471..805c10e7f0c 100644
--- a/cli/azd/internal/vsrpc/environment_service_create.go
+++ b/cli/azd/internal/vsrpc/environment_service_create.go
@@ -37,11 +37,11 @@ func (s *environmentService) CreateEnvironmentAsync(
 		envManager environment.Manager    `container:"type"`
 	}
 
-	container, err := session.newContainer(rc)
+	serverContainer, err := session.newContainer(rc)
 	if err != nil {
 		return false, err
 	}
-	if err := container.Fill(ctx, &c); err != nil {
+	if err := serverContainer.Fill(ctx, &c); err != nil {
 		return false, err
 	}
 
diff --git a/cli/azd/internal/vsrpc/environment_service_load.go b/cli/azd/internal/vsrpc/environment_service_load.go
index d573a630184..de1f2a6b5dd 100644
--- a/cli/azd/internal/vsrpc/environment_service_load.go
+++ b/cli/azd/internal/vsrpc/environment_service_load.go
@@ -50,16 +50,16 @@ func (s *environmentService) LoadEnvironmentAsync(
 		return nil, err
 	}
 
-	container, err := session.newContainer(rc)
+	serverContainer, err := session.newContainer(rc)
 	if err != nil {
 		return nil, err
 	}
 
-	return s.loadEnvironmentAsync(ctx, container, name, true)
+	return s.loadEnvironmentAsync(ctx, serverContainer, name, true)
 }
 
 func (s *environmentService) loadEnvironmentAsync(
-	ctx context.Context, container *serverContainer, name string, mustLoadServices bool,
+	ctx context.Context, serverContainer *serverContainer, name string, mustLoadServices bool,
 ) (*Environment, error) {
 	var c struct {
 		azdCtx         *azdcontext.AzdContext  `container:"type"`
@@ -69,7 +69,7 @@ func (s *environmentService) loadEnvironmentAsync(
 		dotnetImporter *project.DotNetImporter `container:"type"`
 	}
 
-	if err := container.Fill(ctx, &c); err != nil {
+	if err := serverContainer.Fill(ctx, &c); err != nil {
 		return nil, err
 	}
 
diff --git a/cli/azd/internal/vsrpc/environment_service_refresh.go b/cli/azd/internal/vsrpc/environment_service_refresh.go
index 4008367719d..6c1927115c7 100644
--- a/cli/azd/internal/vsrpc/environment_service_refresh.go
+++ b/cli/azd/internal/vsrpc/environment_service_refresh.go
@@ -68,7 +68,7 @@ func (s *environmentService) refreshEnvironmentAsync(
 		}
 	})
 
-	if err := container.Fill(ctx, &c); err != nil {
+	if err := serverContainer.Fill(ctx, &c); err != nil {
 		return nil, err
 	}