diff --git a/staging/src/k8s.io/code-generator/cmd/register-gen/output_tests/simpletype/doc.go b/staging/src/k8s.io/code-generator/cmd/register-gen/output_tests/simpletype/v1/doc.go
similarity index 92%
rename from staging/src/k8s.io/code-generator/cmd/register-gen/output_tests/simpletype/doc.go
rename to staging/src/k8s.io/code-generator/cmd/register-gen/output_tests/simpletype/v1/doc.go
index 8c3b819e019..07b9bb95e3b 100644
--- a/staging/src/k8s.io/code-generator/cmd/register-gen/output_tests/simpletype/doc.go
+++ b/staging/src/k8s.io/code-generator/cmd/register-gen/output_tests/simpletype/v1/doc.go
@@ -16,5 +16,4 @@ limitations under the License.
 
 // +k8s:register-gen=simpletype
 
-// +groupName=simpletype.foo.bar
-package simpletype
+package v1
diff --git a/staging/src/k8s.io/code-generator/cmd/register-gen/output_tests/simpletype/fake_deepcopy.go b/staging/src/k8s.io/code-generator/cmd/register-gen/output_tests/simpletype/v1/fake_deepcopy.go
similarity index 98%
rename from staging/src/k8s.io/code-generator/cmd/register-gen/output_tests/simpletype/fake_deepcopy.go
rename to staging/src/k8s.io/code-generator/cmd/register-gen/output_tests/simpletype/v1/fake_deepcopy.go
index 7a286022479..5f87053d92f 100644
--- a/staging/src/k8s.io/code-generator/cmd/register-gen/output_tests/simpletype/fake_deepcopy.go
+++ b/staging/src/k8s.io/code-generator/cmd/register-gen/output_tests/simpletype/v1/fake_deepcopy.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package simpletype
+package v1
 
 import (
 	"k8s.io/apimachinery/pkg/runtime"
diff --git a/staging/src/k8s.io/code-generator/cmd/register-gen/output_tests/simpletype/types.go b/staging/src/k8s.io/code-generator/cmd/register-gen/output_tests/simpletype/v1/types.go
similarity index 97%
rename from staging/src/k8s.io/code-generator/cmd/register-gen/output_tests/simpletype/types.go
rename to staging/src/k8s.io/code-generator/cmd/register-gen/output_tests/simpletype/v1/types.go
index 5ebd211ee45..9788ca68778 100644
--- a/staging/src/k8s.io/code-generator/cmd/register-gen/output_tests/simpletype/types.go
+++ b/staging/src/k8s.io/code-generator/cmd/register-gen/output_tests/simpletype/v1/types.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package simpletype
+package v1
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/staging/src/k8s.io/code-generator/cmd/register-gen/output_tests/simpletype/zz_generated.register.go b/staging/src/k8s.io/code-generator/cmd/register-gen/output_tests/simpletype/v1/zz_generated.register.go
similarity index 89%
rename from staging/src/k8s.io/code-generator/cmd/register-gen/output_tests/simpletype/zz_generated.register.go
rename to staging/src/k8s.io/code-generator/cmd/register-gen/output_tests/simpletype/v1/zz_generated.register.go
index ca1fef67419..1dcc5674a7b 100644
--- a/staging/src/k8s.io/code-generator/cmd/register-gen/output_tests/simpletype/zz_generated.register.go
+++ b/staging/src/k8s.io/code-generator/cmd/register-gen/output_tests/simpletype/v1/zz_generated.register.go
@@ -19,23 +19,23 @@ limitations under the License.
 
 // Code generated by register-gen. DO NOT EDIT.
 
-package simpletype
+package v1
 
 import (
-	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
 )
 
 // GroupName specifies the group name used to register the objects.
-const GroupName = "simpletype.foo.bar"
+const GroupName = "simpletype"
 
 // GroupVersion specifies the group and the version used to register the objects.
-var GroupVersion = v1.GroupVersion{Group: GroupName, Version: "simpletype"}
+var GroupVersion = metav1.GroupVersion{Group: GroupName, Version: "v1"}
 
 // SchemeGroupVersion is group version used to register these objects
 // Deprecated: use GroupVersion instead.
-var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "simpletype"}
+var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1"}
 
 // Resource takes an unqualified resource and returns a Group qualified GroupResource
 func Resource(resource string) schema.GroupResource {
@@ -64,6 +64,6 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 		&SimpleType{},
 	)
 	// AddToGroupVersion allows the serialization of client types like ListOptions.
-	v1.AddToGroupVersion(scheme, SchemeGroupVersion)
+	metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
 	return nil
 }