diff --git a/CHANGELOG_PENDING.md b/CHANGELOG_PENDING.md
index 58a79ae14..9ef7377eb 100644
--- a/CHANGELOG_PENDING.md
+++ b/CHANGELOG_PENDING.md
@@ -3,3 +3,5 @@
 
 ### Bug Fixes
 
+- [programgen/go] - Don't change imported resource names.
+  [#8353](https://github.com/pulumi/pulumi/pull/8353)
diff --git a/pkg/codegen/go/gen_program.go b/pkg/codegen/go/gen_program.go
index c382714cd..7471a3c96 100644
--- a/pkg/codegen/go/gen_program.go
+++ b/pkg/codegen/go/gen_program.go
@@ -431,7 +431,7 @@ func (g *generator) genResourceOptions(w io.Writer, block *model.Block) {
 
 func (g *generator) genResource(w io.Writer, r *pcl.Resource) {
 
-	resName := makeValidIdentifier(r.Name())
+	resName, resNameVar := r.Name(), makeValidIdentifier(r.Name())
 	pkg, mod, typ, _ := r.DecomposeToken()
 	if mod == "" || strings.HasPrefix(mod, "/") || strings.HasPrefix(mod, "index/") {
 		mod = pkg
@@ -487,7 +487,7 @@ func (g *generator) genResource(w io.Writer, r *pcl.Resource) {
 		rangeExpr, temps := g.lowerExpression(r.Options.Range, rangeType)
 		g.genTemps(w, temps)
 
-		g.Fgenf(w, "var %s []*%s.%s\n", resName, modOrAlias, typ)
+		g.Fgenf(w, "var %s []*%s.%s\n", resNameVar, modOrAlias, typ)
 
 		// ahead of range statement declaration generate the resource instantiation
 		// to detect and removed unused k,v variables
@@ -502,11 +502,11 @@ func (g *generator) genResource(w io.Writer, r *pcl.Resource) {
 
 		g.Fgenf(w, "for key0, %s := range %.v {\n", valVar, rangeExpr)
 		g.Fgen(w, instantiation)
-		g.Fgenf(w, "%s = append(%s, __res)\n", resName, resName)
+		g.Fgenf(w, "%[1]s = append(%[1]s, __res)\n", resNameVar)
 		g.Fgenf(w, "}\n")
 
 	} else {
-		instantiate(resName, fmt.Sprintf("%q", resName), w)
+		instantiate(resNameVar, fmt.Sprintf("%q", resName), w)
 	}
 
 }
diff --git a/pkg/codegen/internal/test/testdata/random-pet-pp/dotnet/random-pet.cs b/pkg/codegen/internal/test/testdata/random-pet-pp/dotnet/random-pet.cs
index 12e2381b9..294bcb0c5 100644
--- a/pkg/codegen/internal/test/testdata/random-pet-pp/dotnet/random-pet.cs
+++ b/pkg/codegen/internal/test/testdata/random-pet-pp/dotnet/random-pet.cs
@@ -5,7 +5,7 @@ class MyStack : Stack
 {
     public MyStack()
     {
-        var random_pet = new Random.RandomPet("random_pet", new Random.RandomPetArgs
+        var random_pet = new Random.RandomPet("random-pet", new Random.RandomPetArgs
         {
             Prefix = "doggo",
         });
diff --git a/pkg/codegen/internal/test/testdata/random-pet-pp/go/random-pet.go b/pkg/codegen/internal/test/testdata/random-pet-pp/go/random-pet.go
index bdaa9eda4..caf7b8415 100644
--- a/pkg/codegen/internal/test/testdata/random-pet-pp/go/random-pet.go
+++ b/pkg/codegen/internal/test/testdata/random-pet-pp/go/random-pet.go
@@ -7,7 +7,7 @@ import (
 
 func main() {
 	pulumi.Run(func(ctx *pulumi.Context) error {
-		_, err := random.NewRandomPet(ctx, "random_pet", &random.RandomPetArgs{
+		_, err := random.NewRandomPet(ctx, "random-pet", &random.RandomPetArgs{
 			Prefix: pulumi.String("doggo"),
 		})
 		if err != nil {
diff --git a/pkg/codegen/internal/test/testdata/random-pet-pp/nodejs/random-pet.ts b/pkg/codegen/internal/test/testdata/random-pet-pp/nodejs/random-pet.ts
index fc9bb701c..308653ca7 100644
--- a/pkg/codegen/internal/test/testdata/random-pet-pp/nodejs/random-pet.ts
+++ b/pkg/codegen/internal/test/testdata/random-pet-pp/nodejs/random-pet.ts
@@ -1,4 +1,4 @@
 import * as pulumi from "@pulumi/pulumi";
 import * as random from "@pulumi/random";
 
-const random_pet = new random.RandomPet("random_pet", {prefix: "doggo"});
+const random_pet = new random.RandomPet("random-pet", {prefix: "doggo"});
diff --git a/pkg/codegen/internal/test/testdata/random-pet-pp/python/random-pet.py b/pkg/codegen/internal/test/testdata/random-pet-pp/python/random-pet.py
index 46b11f9bd..ac6d7305a 100644
--- a/pkg/codegen/internal/test/testdata/random-pet-pp/python/random-pet.py
+++ b/pkg/codegen/internal/test/testdata/random-pet-pp/python/random-pet.py
@@ -1,4 +1,4 @@
 import pulumi
 import pulumi_random as random
 
-random_pet = random.RandomPet("random_pet", prefix="doggo")
+random_pet = random.RandomPet("random-pet", prefix="doggo")
diff --git a/pkg/codegen/internal/test/testdata/random-pet-pp/random-pet.pp b/pkg/codegen/internal/test/testdata/random-pet-pp/random-pet.pp
index a2d4da888..50079ec28 100644
--- a/pkg/codegen/internal/test/testdata/random-pet-pp/random-pet.pp
+++ b/pkg/codegen/internal/test/testdata/random-pet-pp/random-pet.pp
@@ -1,3 +1,3 @@
-resource random_pet "random:index/randomPet:RandomPet" {
+resource random-pet "random:index/randomPet:RandomPet" {
   prefix = "doggo"
 }
\ No newline at end of file