diff --git a/staging/src/k8s.io/code-generator/cmd/go-to-protobuf/protobuf/namer.go b/staging/src/k8s.io/code-generator/cmd/go-to-protobuf/protobuf/namer.go
index 423577a12e9..e3b21c6703f 100644
--- a/staging/src/k8s.io/code-generator/cmd/go-to-protobuf/protobuf/namer.go
+++ b/staging/src/k8s.io/code-generator/cmd/go-to-protobuf/protobuf/namer.go
@@ -116,7 +116,10 @@ func assignGoTypeToProtoPackage(p *protobufPackage, t *types.Type, local, global
 		}
 		return
 	}
-	global[t.Name] = p
+	if t.Name.Package == p.PackagePath {
+		// Associate types only to their own package
+		global[t.Name] = p
+	}
 	if _, ok := local[t.Name]; ok {
 		return
 	}