diff --git a/dev-lang/go/go-1.18.4.ebuild b/dev-lang/go/go-1.18.4.ebuild
index 7f1ce9304e519..b8ededbce7582 100644
--- a/dev-lang/go/go-1.18.4.ebuild
+++ b/dev-lang/go/go-1.18.4.ebuild
@@ -64,14 +64,14 @@ README.md
 
 go_arch() {
 	# By chance most portage arch names match Go
-	local portage_arch=$(tc-arch $@)
-	case "${portage_arch}" in
+	local tc_arch=$(tc-arch $@)
+	case "${tc_arch}" in
 		x86)	echo 386;;
 		x64-*)	echo amd64;;
 		ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo ppc64le ;;
 		riscv) echo riscv64 ;;
 		s390) echo s390x ;;
-		*)		echo "${portage_arch}";;
+		*)		echo "${tc_arch}";;
 	esac
 }
 
diff --git a/dev-lang/go/go-1.18.5.ebuild b/dev-lang/go/go-1.18.5.ebuild
index 2178910467028..c340b58732646 100644
--- a/dev-lang/go/go-1.18.5.ebuild
+++ b/dev-lang/go/go-1.18.5.ebuild
@@ -64,14 +64,14 @@ README.md
 
 go_arch() {
 	# By chance most portage arch names match Go
-	local portage_arch=$(tc-arch $@)
-	case "${portage_arch}" in
+	local tc_arch=$(tc-arch $@)
+	case "${tc_arch}" in
 		x86)	echo 386;;
 		x64-*)	echo amd64;;
 		ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo ppc64le ;;
 		riscv) echo riscv64 ;;
 		s390) echo s390x ;;
-		*)		echo "${portage_arch}";;
+		*)		echo "${tc_arch}";;
 	esac
 }
 
diff --git a/dev-lang/go/go-1.19.ebuild b/dev-lang/go/go-1.19.ebuild
index 2178910467028..c340b58732646 100644
--- a/dev-lang/go/go-1.19.ebuild
+++ b/dev-lang/go/go-1.19.ebuild
@@ -64,14 +64,14 @@ README.md
 
 go_arch() {
 	# By chance most portage arch names match Go
-	local portage_arch=$(tc-arch $@)
-	case "${portage_arch}" in
+	local tc_arch=$(tc-arch $@)
+	case "${tc_arch}" in
 		x86)	echo 386;;
 		x64-*)	echo amd64;;
 		ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo ppc64le ;;
 		riscv) echo riscv64 ;;
 		s390) echo s390x ;;
-		*)		echo "${portage_arch}";;
+		*)		echo "${tc_arch}";;
 	esac
 }
 
diff --git a/dev-lang/go/go-9999.ebuild b/dev-lang/go/go-9999.ebuild
index 2178910467028..c340b58732646 100644
--- a/dev-lang/go/go-9999.ebuild
+++ b/dev-lang/go/go-9999.ebuild
@@ -64,14 +64,14 @@ README.md
 
 go_arch() {
 	# By chance most portage arch names match Go
-	local portage_arch=$(tc-arch $@)
-	case "${portage_arch}" in
+	local tc_arch=$(tc-arch $@)
+	case "${tc_arch}" in
 		x86)	echo 386;;
 		x64-*)	echo amd64;;
 		ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo ppc64le ;;
 		riscv) echo riscv64 ;;
 		s390) echo s390x ;;
-		*)		echo "${portage_arch}";;
+		*)		echo "${tc_arch}";;
 	esac
 }