diff --git a/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/maps/keys/doc.go b/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/maps/keys/doc.go
index 7ca38161c00..5c91c5cd4d7 100644
--- a/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/maps/keys/doc.go
+++ b/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/maps/keys/doc.go
@@ -19,7 +19,7 @@ limitations under the License.
 // +k8s:validation-gen-test-fixture=validateFalse
 
 // This is a test package.
-package eachkey
+package keys
 
 import "k8s.io/code-generator/cmd/validation-gen/testscheme"
 
diff --git a/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/maps/keys/testdata/validate-false.json b/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/maps/keys/testdata/validate-false.json
index fae9843f0a1..e8cf6cebfaf 100644
--- a/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/maps/keys/testdata/validate-false.json
+++ b/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/maps/keys/testdata/validate-false.json
@@ -1,5 +1,5 @@
 {
-  "*eachkey.Struct": {
+  "*keys.Struct": {
     "": [
       "type Struct"
     ],
diff --git a/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/maps/keys/zz_generated.validations.go b/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/maps/keys/zz_generated.validations.go
index 8af55dea5f5..ea7886e55a9 100644
--- a/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/maps/keys/zz_generated.validations.go
+++ b/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/maps/keys/zz_generated.validations.go
@@ -19,7 +19,7 @@ limitations under the License.
 
 // Code generated by validation-gen. DO NOT EDIT.
 
-package eachkey
+package keys
 
 import (
 	context "context"
diff --git a/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/maps/keys/zz_generated.validations_test.go b/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/maps/keys/zz_generated.validations_test.go
index a0afa9ba1e8..7cc3aa090f8 100644
--- a/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/maps/keys/zz_generated.validations_test.go
+++ b/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/maps/keys/zz_generated.validations_test.go
@@ -19,7 +19,7 @@ limitations under the License.
 
 // Code generated by validation-gen. DO NOT EDIT.
 
-package eachkey
+package keys
 
 import (
 	"testing"
diff --git a/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/tags/immutable/doc.go b/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/tags/immutable/doc.go
index ddee7351b84..d2c1cc52874 100644
--- a/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/tags/immutable/doc.go
+++ b/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/tags/immutable/doc.go
@@ -18,7 +18,7 @@ limitations under the License.
 // +k8s:validation-gen-scheme-registry=k8s.io/code-generator/cmd/validation-gen/testscheme.Scheme
 
 // This is a test package.
-package format
+package immutable
 
 import "k8s.io/code-generator/cmd/validation-gen/testscheme"
 
diff --git a/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/tags/immutable/doc_test.go b/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/tags/immutable/doc_test.go
index 4649123fe47..a2bfdcf5d11 100644
--- a/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/tags/immutable/doc_test.go
+++ b/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/tags/immutable/doc_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package format
+package immutable
 
 import (
 	"testing"
diff --git a/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/tags/immutable/zz_generated.validations.go b/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/tags/immutable/zz_generated.validations.go
index 911f89d01d7..fb94584b247 100644
--- a/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/tags/immutable/zz_generated.validations.go
+++ b/staging/src/k8s.io/code-generator/cmd/validation-gen/output_tests/tags/immutable/zz_generated.validations.go
@@ -19,7 +19,7 @@ limitations under the License.
 
 // Code generated by validation-gen. DO NOT EDIT.
 
-package format
+package immutable
 
 import (
 	context "context"