4 files changed, 10 insertions, 6 deletions
diff --git a/tools/go_generics/generics.go b/tools/go_generics/generics.go
index ca414d8cb..22c714c13 100644
--- a/tools/go_generics/generics.go
+++ b/tools/go_generics/generics.go
@@ -98,7 +98,7 @@ import (
 	"regexp"
 	"strings"
 
-	"gvisor.googlesource.com/gvisor/tools/go_generics/globals"
+	"gvisor.dev/gvisor/tools/go_generics/globals"
 )
 
 var (
@@ -222,7 +222,11 @@ func main() {
 				// Modify the state tag appropriately.
 				if m := stateTagRegexp.FindStringSubmatch(ident.Name); m != nil {
 					if t := identifierRegexp.FindStringSubmatch(m[2]); t != nil {
-						ident.Name = m[1] + `state:".(` + t[1] + *prefix + t[2] + *suffix + t[3] + `)"` + m[3]
+						typeName := *prefix + t[2] + *suffix
+						if n, ok := types[t[2]]; ok {
+							typeName = n
+						}
+						ident.Name = m[1] + `state:".(` + t[1] + typeName + t[3] + `)"` + m[3]
 					}
 				}
 			}
diff --git a/tools/go_generics/globals/BUILD b/tools/go_generics/globals/BUILD
index 6628132f5..74853c7d2 100644
--- a/tools/go_generics/globals/BUILD
+++ b/tools/go_generics/globals/BUILD
@@ -8,6 +8,6 @@ go_library(
         "globals_visitor.go",
         "scope.go",
     ],
-    importpath = "gvisor.googlesource.com/gvisor/tools/go_generics/globals",
+    importpath = "gvisor.dev/gvisor/tools/go_generics/globals",
     visibility = ["//tools/go_generics:__pkg__"],
 )
diff --git a/tools/go_generics/globals/globals_visitor.go b/tools/go_generics/globals/globals_visitor.go
index 7ae48c662..3f948637b 100644
--- a/tools/go_generics/globals/globals_visitor.go
+++ b/tools/go_generics/globals/globals_visitor.go
@@ -132,7 +132,7 @@ func (v *globalsVisitor) visitFields(l *ast.FieldList, kind SymKind) {
 	}
 }
 
-// visitGenDecl is called when a generic declation is encountered, for example,
+// visitGenDecl is called when a generic declaration is encountered, for example,
 // on variable, constant and type declarations. It adds all newly defined
 // symbols to the current scope and reports them if the current scope is the
 // global one.
@@ -490,7 +490,7 @@ func (v *globalsVisitor) visitBlockStmt(s *ast.BlockStmt) {
 	v.popScope()
 }
 
-// visitFuncDecl is called when a function or method declation is encountered.
+// visitFuncDecl is called when a function or method declaration is encountered.
 // it creates a new scope for the function [optional] receiver, parameters and
 // results, and visits all children nodes.
 func (v *globalsVisitor) visitFuncDecl(d *ast.FuncDecl) {
diff --git a/tools/go_generics/imports.go b/tools/go_generics/imports.go
index 3a7230c97..148dc7216 100644
--- a/tools/go_generics/imports.go
+++ b/tools/go_generics/imports.go
@@ -23,7 +23,7 @@ import (
 	"go/token"
 	"strconv"
 
-	"gvisor.googlesource.com/gvisor/tools/go_generics/globals"
+	"gvisor.dev/gvisor/tools/go_generics/globals"
 )
 
 type importedPackage struct {