diff --git a/examples/helm-example.yaml b/examples/helm-example.yaml
index cdf21fd..08180c8 100644
--- a/examples/helm-example.yaml
+++ b/examples/helm-example.yaml
@@ -773,8 +773,8 @@ spec:
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  namespace: fooo
   name: my-config-map
+  namespace: fooo
 data:
   key1: value1
   key2: value2
diff --git a/examples/my-k8s-app/ConfigMap.my-config-map.yaml b/examples/my-k8s-app/ConfigMap.my-config-map.yaml
index a7afca4..90fa6b4 100644
--- a/examples/my-k8s-app/ConfigMap.my-config-map.yaml
+++ b/examples/my-k8s-app/ConfigMap.my-config-map.yaml
@@ -1,8 +1,8 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  namespace: fooo
   name: my-config-map
+  namespace: fooo
 data:
   key1: value1
   key2: value2
diff --git a/packages/cli/group-version-kind-map.json b/packages/cli/group-version-kind-map.json
index 3a4a3b3..2444d72 100644
--- a/packages/cli/group-version-kind-map.json
+++ b/packages/cli/group-version-kind-map.json
@@ -1,7 +1,7 @@
 {
   "APIGroupv1": {
     "schemaName": "io.k8s.apimachinery.pkg.apis.meta.v1.APIGroup",
-    "fileName": "apis_openapi.json",
+    "fileName": "apis__authentication.k8s.io_openapi.json",
     "gvk": [
       {
         "group": "",
@@ -12,7 +12,7 @@
   },
   "APIResourcev1": {
     "schemaName": "io.k8s.apimachinery.pkg.apis.meta.v1.APIResource",
-    "fileName": "apis__storagemigration.k8s.io__v1alpha1_openapi.json"
+    "fileName": "apis__resource.k8s.io__v1alpha3_openapi.json"
   },
   "APIServiceConditionv1": {
     "schemaName": "io.k8s.kube-aggregator.pkg.apis.apiregistration.v1.APIServiceCondition",
@@ -64,7 +64,7 @@
   },
   "Affinityv1": {
     "schemaName": "io.k8s.api.core.v1.Affinity",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "AggregationRulev1": {
     "schemaName": "io.k8s.api.rbac.v1.AggregationRule",
@@ -100,7 +100,7 @@
   },
   "AppArmorProfilev1": {
     "schemaName": "io.k8s.api.core.v1.AppArmorProfile",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "ApplyConfigurationv1alpha1": {
     "schemaName": "io.k8s.api.admissionregistration.v1alpha1.ApplyConfiguration",
@@ -141,7 +141,7 @@
   },
   "AzureFileVolumeSourcev1": {
     "schemaName": "io.k8s.api.core.v1.AzureFileVolumeSource",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "BasicDevicev1alpha3": {
     "schemaName": "io.k8s.api.resource.v1alpha3.BasicDevice",
@@ -233,11 +233,11 @@
   },
   "CSIVolumeSourcev1": {
     "schemaName": "io.k8s.api.core.v1.CSIVolumeSource",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "Capabilitiesv1": {
     "schemaName": "io.k8s.api.core.v1.Capabilities",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "CephFSPersistentVolumeSourcev1": {
     "schemaName": "io.k8s.api.core.v1.CephFSPersistentVolumeSource",
@@ -245,7 +245,7 @@
   },
   "CephFSVolumeSourcev1": {
     "schemaName": "io.k8s.api.core.v1.CephFSVolumeSource",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "CertificateSigningRequestConditionv1": {
     "schemaName": "io.k8s.api.certificates.v1.CertificateSigningRequestCondition",
@@ -278,7 +278,7 @@
   },
   "CinderVolumeSourcev1": {
     "schemaName": "io.k8s.api.core.v1.CinderVolumeSource",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "ClientIPConfigv1": {
     "schemaName": "io.k8s.api.core.v1.ClientIPConfig",
@@ -312,7 +312,7 @@
   },
   "ClusterTrustBundleProjectionv1": {
     "schemaName": "io.k8s.api.core.v1.ClusterTrustBundleProjection",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "ClusterTrustBundleSpecv1alpha1": {
     "schemaName": "io.k8s.api.certificates.v1alpha1.ClusterTrustBundleSpec",
@@ -348,15 +348,15 @@
   },
   "Conditionv1": {
     "schemaName": "io.k8s.apimachinery.pkg.apis.meta.v1.Condition",
-    "fileName": "apis__resource.k8s.io__v1beta1_openapi.json"
+    "fileName": "apis__resource.k8s.io__v1alpha3_openapi.json"
   },
   "ConfigMapEnvSourcev1": {
     "schemaName": "io.k8s.api.core.v1.ConfigMapEnvSource",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "ConfigMapKeySelectorv1": {
     "schemaName": "io.k8s.api.core.v1.ConfigMapKeySelector",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "ConfigMapNodeConfigSourcev1": {
     "schemaName": "io.k8s.api.core.v1.ConfigMapNodeConfigSource",
@@ -364,11 +364,11 @@
   },
   "ConfigMapProjectionv1": {
     "schemaName": "io.k8s.api.core.v1.ConfigMapProjection",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "ConfigMapVolumeSourcev1": {
     "schemaName": "io.k8s.api.core.v1.ConfigMapVolumeSource",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "ConfigMapv1": {
     "schemaName": "io.k8s.api.core.v1.ConfigMap",
@@ -389,11 +389,11 @@
   },
   "ContainerPortv1": {
     "schemaName": "io.k8s.api.core.v1.ContainerPort",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "ContainerResizePolicyv1": {
     "schemaName": "io.k8s.api.core.v1.ContainerResizePolicy",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "ContainerResourceMetricSourcev2": {
     "schemaName": "io.k8s.api.autoscaling.v2.ContainerResourceMetricSource",
@@ -429,7 +429,7 @@
   },
   "Containerv1": {
     "schemaName": "io.k8s.api.core.v1.Container",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "ControllerRevisionv1": {
     "schemaName": "io.k8s.api.apps.v1.ControllerRevision",
@@ -586,7 +586,7 @@
   },
   "DeleteOptionsv1": {
     "schemaName": "io.k8s.apimachinery.pkg.apis.meta.v1.DeleteOptions",
-    "fileName": "apis__storagemigration.k8s.io__v1alpha1_openapi.json",
+    "fileName": "apis__resource.k8s.io__v1alpha3_openapi.json",
     "gvk": [
       {
         "group": "",
@@ -1056,19 +1056,19 @@
   },
   "DownwardAPIProjectionv1": {
     "schemaName": "io.k8s.api.core.v1.DownwardAPIProjection",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "DownwardAPIVolumeFilev1": {
     "schemaName": "io.k8s.api.core.v1.DownwardAPIVolumeFile",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "DownwardAPIVolumeSourcev1": {
     "schemaName": "io.k8s.api.core.v1.DownwardAPIVolumeSource",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "EmptyDirVolumeSourcev1": {
     "schemaName": "io.k8s.api.core.v1.EmptyDirVolumeSource",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "EndpointAddressv1": {
     "schemaName": "io.k8s.api.core.v1.EndpointAddress",
@@ -1118,27 +1118,27 @@
   },
   "EnvFromSourcev1": {
     "schemaName": "io.k8s.api.core.v1.EnvFromSource",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "EnvVarSourcev1": {
     "schemaName": "io.k8s.api.core.v1.EnvVarSource",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "EnvVarv1": {
     "schemaName": "io.k8s.api.core.v1.EnvVar",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "EphemeralContainerv1": {
     "schemaName": "io.k8s.api.core.v1.EphemeralContainer",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "EphemeralVolumeSourcev1": {
     "schemaName": "io.k8s.api.core.v1.EphemeralVolumeSource",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "EventSourcev1": {
     "schemaName": "io.k8s.api.core.v1.EventSource",
-    "fileName": "apis__events.k8s.io__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "EventsEventSeriesv1": {
     "schemaName": "io.k8s.api.events.v1.EventSeries",
@@ -1172,7 +1172,7 @@
   },
   "ExecActionv1": {
     "schemaName": "io.k8s.api.core.v1.ExecAction",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "ExemptPriorityLevelConfigurationv1": {
     "schemaName": "io.k8s.api.flowcontrol.v1.ExemptPriorityLevelConfiguration",
@@ -1212,7 +1212,7 @@
   },
   "FieldsV1v1": {
     "schemaName": "io.k8s.apimachinery.pkg.apis.meta.v1.FieldsV1",
-    "fileName": "apis__storagemigration.k8s.io__v1alpha1_openapi.json"
+    "fileName": "apis__resource.k8s.io__v1alpha3_openapi.json"
   },
   "FlexPersistentVolumeSourcev1": {
     "schemaName": "io.k8s.api.core.v1.FlexPersistentVolumeSource",
@@ -1220,7 +1220,7 @@
   },
   "FlexVolumeSourcev1": {
     "schemaName": "io.k8s.api.core.v1.FlexVolumeSource",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "FlockerVolumeSourcev1": {
     "schemaName": "io.k8s.api.core.v1.FlockerVolumeSource",
@@ -1269,11 +1269,11 @@
   },
   "GRPCActionv1": {
     "schemaName": "io.k8s.api.core.v1.GRPCAction",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "GitRepoVolumeSourcev1": {
     "schemaName": "io.k8s.api.core.v1.GitRepoVolumeSource",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "GlusterfsPersistentVolumeSourcev1": {
     "schemaName": "io.k8s.api.core.v1.GlusterfsPersistentVolumeSource",
@@ -1281,7 +1281,7 @@
   },
   "GlusterfsVolumeSourcev1": {
     "schemaName": "io.k8s.api.core.v1.GlusterfsVolumeSource",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "GroupSubjectv1": {
     "schemaName": "io.k8s.api.flowcontrol.v1.GroupSubject",
@@ -1289,7 +1289,7 @@
   },
   "GroupVersionForDiscoveryv1": {
     "schemaName": "io.k8s.apimachinery.pkg.apis.meta.v1.GroupVersionForDiscovery",
-    "fileName": "apis_openapi.json"
+    "fileName": "apis__authentication.k8s.io_openapi.json"
   },
   "GroupVersionResourcev1alpha1": {
     "schemaName": "io.k8s.api.storagemigration.v1alpha1.GroupVersionResource",
@@ -1305,11 +1305,11 @@
   },
   "HTTPGetActionv1": {
     "schemaName": "io.k8s.api.core.v1.HTTPGetAction",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "HTTPHeaderv1": {
     "schemaName": "io.k8s.api.core.v1.HTTPHeader",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "HTTPIngressPathv1": {
     "schemaName": "io.k8s.api.networking.v1.HTTPIngressPath",
@@ -1371,7 +1371,7 @@
   },
   "HostAliasv1": {
     "schemaName": "io.k8s.api.core.v1.HostAlias",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "HostIPv1": {
     "schemaName": "io.k8s.api.core.v1.HostIP",
@@ -1408,11 +1408,11 @@
   },
   "ISCSIVolumeSourcev1": {
     "schemaName": "io.k8s.api.core.v1.ISCSIVolumeSource",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "ImageVolumeSourcev1": {
     "schemaName": "io.k8s.api.core.v1.ImageVolumeSource",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "IngressBackendv1": {
     "schemaName": "io.k8s.api.networking.v1.IngressBackend",
@@ -1486,7 +1486,7 @@
   },
   "IntOrString": {
     "schemaName": "io.k8s.apimachinery.pkg.util.intstr.IntOrString",
-    "fileName": "apis__policy__v1_openapi.json"
+    "fileName": "apis__networking.k8s.io__v1_openapi.json"
   },
   "JSONPatchv1alpha1": {
     "schemaName": "io.k8s.api.admissionregistration.v1alpha1.JSONPatch",
@@ -1543,7 +1543,7 @@
   },
   "KeyToPathv1": {
     "schemaName": "io.k8s.api.core.v1.KeyToPath",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "LabelSelectorAttributesv1": {
     "schemaName": "io.k8s.api.authorization.v1.LabelSelectorAttributes",
@@ -1551,11 +1551,11 @@
   },
   "LabelSelectorRequirementv1": {
     "schemaName": "io.k8s.apimachinery.pkg.apis.meta.v1.LabelSelectorRequirement",
-    "fileName": "apis__storage.k8s.io__v1_openapi.json"
+    "fileName": "apis__admissionregistration.k8s.io__v1alpha1_openapi.json"
   },
   "LabelSelectorv1": {
     "schemaName": "io.k8s.apimachinery.pkg.apis.meta.v1.LabelSelector",
-    "fileName": "apis__storage.k8s.io__v1_openapi.json"
+    "fileName": "apis__admissionregistration.k8s.io__v1alpha1_openapi.json"
   },
   "LeaseCandidateSpecv1alpha2": {
     "schemaName": "io.k8s.api.coordination.v1alpha2.LeaseCandidateSpec",
@@ -1593,11 +1593,11 @@
   },
   "LifecycleHandlerv1": {
     "schemaName": "io.k8s.api.core.v1.LifecycleHandler",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "Lifecyclev1": {
     "schemaName": "io.k8s.api.core.v1.Lifecycle",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "LimitRangeItemv1": {
     "schemaName": "io.k8s.api.core.v1.LimitRangeItem",
@@ -1634,7 +1634,7 @@
   },
   "ListMetav1": {
     "schemaName": "io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta",
-    "fileName": "apis__storagemigration.k8s.io__v1alpha1_openapi.json"
+    "fileName": "apis__resource.k8s.io__v1alpha3_openapi.json"
   },
   "LoadBalancerIngressv1": {
     "schemaName": "io.k8s.api.core.v1.LoadBalancerIngress",
@@ -1646,7 +1646,7 @@
   },
   "LocalObjectReferencev1": {
     "schemaName": "io.k8s.api.core.v1.LocalObjectReference",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "LocalSubjectAccessReviewv1": {
     "schemaName": "io.k8s.api.authorization.v1.LocalSubjectAccessReview",
@@ -1667,7 +1667,7 @@
   },
   "ManagedFieldsEntryv1": {
     "schemaName": "io.k8s.apimachinery.pkg.apis.meta.v1.ManagedFieldsEntry",
-    "fileName": "apis__storagemigration.k8s.io__v1alpha1_openapi.json"
+    "fileName": "apis__resource.k8s.io__v1alpha3_openapi.json"
   },
   "MatchConditionv1": {
     "schemaName": "io.k8s.api.admissionregistration.v1.MatchCondition",
@@ -1715,7 +1715,7 @@
   },
   "MicroTimev1": {
     "schemaName": "io.k8s.apimachinery.pkg.apis.meta.v1.MicroTime",
-    "fileName": "apis__events.k8s.io__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "MigrationConditionv1alpha1": {
     "schemaName": "io.k8s.api.storagemigration.v1alpha1.MigrationCondition",
@@ -1723,7 +1723,7 @@
   },
   "ModifyVolumeStatusv1": {
     "schemaName": "io.k8s.api.core.v1.ModifyVolumeStatus",
-    "fileName": "apis__apps__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "MutatingAdmissionPolicyBindingSpecv1alpha1": {
     "schemaName": "io.k8s.api.admissionregistration.v1alpha1.MutatingAdmissionPolicyBindingSpec",
@@ -1868,7 +1868,7 @@
   },
   "NodeAffinityv1": {
     "schemaName": "io.k8s.api.core.v1.NodeAffinity",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "NodeConditionv1": {
     "schemaName": "io.k8s.api.core.v1.NodeCondition",
@@ -1900,15 +1900,15 @@
   },
   "NodeSelectorRequirementv1": {
     "schemaName": "io.k8s.api.core.v1.NodeSelectorRequirement",
-    "fileName": "apis__storage.k8s.io__v1_openapi.json"
+    "fileName": "apis__resource.k8s.io__v1alpha3_openapi.json"
   },
   "NodeSelectorTermv1": {
     "schemaName": "io.k8s.api.core.v1.NodeSelectorTerm",
-    "fileName": "apis__storage.k8s.io__v1_openapi.json"
+    "fileName": "apis__resource.k8s.io__v1alpha3_openapi.json"
   },
   "NodeSelectorv1": {
     "schemaName": "io.k8s.api.core.v1.NodeSelector",
-    "fileName": "apis__storage.k8s.io__v1_openapi.json"
+    "fileName": "apis__resource.k8s.io__v1alpha3_openapi.json"
   },
   "NodeSpecv1": {
     "schemaName": "io.k8s.api.core.v1.NodeSpec",
@@ -1949,11 +1949,11 @@
   },
   "ObjectFieldSelectorv1": {
     "schemaName": "io.k8s.api.core.v1.ObjectFieldSelector",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "ObjectMetav1": {
     "schemaName": "io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta",
-    "fileName": "apis__storagemigration.k8s.io__v1alpha1_openapi.json"
+    "fileName": "apis__resource.k8s.io__v1alpha3_openapi.json"
   },
   "ObjectMetricSourcev2": {
     "schemaName": "io.k8s.api.autoscaling.v2.ObjectMetricSource",
@@ -1981,7 +1981,7 @@
   },
   "OwnerReferencev1": {
     "schemaName": "io.k8s.apimachinery.pkg.apis.meta.v1.OwnerReference",
-    "fileName": "apis__storagemigration.k8s.io__v1alpha1_openapi.json"
+    "fileName": "apis__resource.k8s.io__v1alpha3_openapi.json"
   },
   "ParamKindv1": {
     "schemaName": "io.k8s.api.admissionregistration.v1.ParamKind",
@@ -2013,38 +2013,40 @@
   },
   "Patchv1": {
     "schemaName": "io.k8s.apimachinery.pkg.apis.meta.v1.Patch",
-    "fileName": "apis__storagemigration.k8s.io__v1alpha1_openapi.json"
+    "fileName": "apis__resource.k8s.io__v1alpha3_openapi.json"
   },
   "PersistentVolumeClaimConditionv1": {
     "schemaName": "io.k8s.api.core.v1.PersistentVolumeClaimCondition",
-    "fileName": "apis__apps__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "PersistentVolumeClaimSpecv1": {
     "schemaName": "io.k8s.api.core.v1.PersistentVolumeClaimSpec",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "PersistentVolumeClaimStatusv1": {
     "schemaName": "io.k8s.api.core.v1.PersistentVolumeClaimStatus",
-    "fileName": "apis__apps__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "PersistentVolumeClaimTemplatev1": {
     "schemaName": "io.k8s.api.core.v1.PersistentVolumeClaimTemplate",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "PersistentVolumeClaimVolumeSourcev1": {
     "schemaName": "io.k8s.api.core.v1.PersistentVolumeClaimVolumeSource",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "PersistentVolumeClaimv1": {
     "schemaName": "io.k8s.api.core.v1.PersistentVolumeClaim",
-    "fileName": "apis__apps__v1_openapi.json",
+    "fileName": "api__v1_openapi.json",
     "gvk": [
       {
         "group": "",
         "kind": "PersistentVolumeClaim",
         "version": "v1"
       }
-    ]
+    ],
+    "path": "/api/v1/namespaces/{namespace}/persistentvolumeclaims",
+    "namespaced": true
   },
   "PersistentVolumeSpecv1": {
     "schemaName": "io.k8s.api.core.v1.PersistentVolumeSpec",
@@ -2073,15 +2075,15 @@
   },
   "PodAffinityTermv1": {
     "schemaName": "io.k8s.api.core.v1.PodAffinityTerm",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "PodAffinityv1": {
     "schemaName": "io.k8s.api.core.v1.PodAffinity",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "PodAntiAffinityv1": {
     "schemaName": "io.k8s.api.core.v1.PodAntiAffinity",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "PodConditionv1": {
     "schemaName": "io.k8s.api.core.v1.PodCondition",
@@ -2089,11 +2091,11 @@
   },
   "PodDNSConfigOptionv1": {
     "schemaName": "io.k8s.api.core.v1.PodDNSConfigOption",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "PodDNSConfigv1": {
     "schemaName": "io.k8s.api.core.v1.PodDNSConfig",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "PodDisruptionBudgetSpecv1": {
     "schemaName": "io.k8s.api.policy.v1.PodDisruptionBudgetSpec",
@@ -2138,11 +2140,11 @@
   },
   "PodOSv1": {
     "schemaName": "io.k8s.api.core.v1.PodOS",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "PodReadinessGatev1": {
     "schemaName": "io.k8s.api.core.v1.PodReadinessGate",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "PodResourceClaimStatusv1": {
     "schemaName": "io.k8s.api.core.v1.PodResourceClaimStatus",
@@ -2150,19 +2152,19 @@
   },
   "PodResourceClaimv1": {
     "schemaName": "io.k8s.api.core.v1.PodResourceClaim",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "PodSchedulingGatev1": {
     "schemaName": "io.k8s.api.core.v1.PodSchedulingGate",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "PodSecurityContextv1": {
     "schemaName": "io.k8s.api.core.v1.PodSecurityContext",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "PodSpecv1": {
     "schemaName": "io.k8s.api.core.v1.PodSpec",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "PodStatusv1": {
     "schemaName": "io.k8s.api.core.v1.PodStatus",
@@ -2170,7 +2172,7 @@
   },
   "PodTemplateSpecv1": {
     "schemaName": "io.k8s.api.core.v1.PodTemplateSpec",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "PodTemplatev1": {
     "schemaName": "io.k8s.api.core.v1.PodTemplate",
@@ -2224,11 +2226,11 @@
   },
   "Preconditionsv1": {
     "schemaName": "io.k8s.apimachinery.pkg.apis.meta.v1.Preconditions",
-    "fileName": "apis__storagemigration.k8s.io__v1alpha1_openapi.json"
+    "fileName": "apis__resource.k8s.io__v1alpha3_openapi.json"
   },
   "PreferredSchedulingTermv1": {
     "schemaName": "io.k8s.api.core.v1.PreferredSchedulingTerm",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "PriorityClassv1": {
     "schemaName": "io.k8s.api.scheduling.v1.PriorityClass",
@@ -2274,15 +2276,15 @@
   },
   "Probev1": {
     "schemaName": "io.k8s.api.core.v1.Probe",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "ProjectedVolumeSourcev1": {
     "schemaName": "io.k8s.api.core.v1.ProjectedVolumeSource",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "Quantity": {
     "schemaName": "io.k8s.apimachinery.pkg.api.resource.Quantity",
-    "fileName": "apis__storage.k8s.io__v1_openapi.json"
+    "fileName": "apis__resource.k8s.io__v1alpha3_openapi.json"
   },
   "QueuingConfigurationv1": {
     "schemaName": "io.k8s.api.flowcontrol.v1.QueuingConfiguration",
@@ -2298,11 +2300,11 @@
   },
   "RBDVolumeSourcev1": {
     "schemaName": "io.k8s.api.core.v1.RBDVolumeSource",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "RawExtension": {
     "schemaName": "io.k8s.apimachinery.pkg.runtime.RawExtension",
-    "fileName": "apis__storagemigration.k8s.io__v1alpha1_openapi.json"
+    "fileName": "apis__resource.k8s.io__v1alpha3_openapi.json"
   },
   "RbacSubjectv1": {
     "schemaName": "io.k8s.api.rbac.v1.Subject",
@@ -2422,7 +2424,7 @@
   },
   "ResourceClaimv1": {
     "schemaName": "io.k8s.api.core.v1.ResourceClaim",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "ResourceClaimv1alpha3": {
     "schemaName": "io.k8s.api.resource.v1alpha3.ResourceClaim",
@@ -2452,7 +2454,7 @@
   },
   "ResourceFieldSelectorv1": {
     "schemaName": "io.k8s.api.core.v1.ResourceFieldSelector",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "ResourceHealthv1": {
     "schemaName": "io.k8s.api.core.v1.ResourceHealth",
@@ -2501,7 +2503,7 @@
   },
   "ResourceRequirementsv1": {
     "schemaName": "io.k8s.api.core.v1.ResourceRequirements",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "ResourceRulev1": {
     "schemaName": "io.k8s.api.authorization.v1.ResourceRule",
@@ -2606,7 +2608,7 @@
   },
   "SELinuxOptionsv1": {
     "schemaName": "io.k8s.api.core.v1.SELinuxOptions",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "ScaleIOPersistentVolumeSourcev1": {
     "schemaName": "io.k8s.api.core.v1.ScaleIOPersistentVolumeSource",
@@ -2614,19 +2616,19 @@
   },
   "ScaleIOVolumeSourcev1": {
     "schemaName": "io.k8s.api.core.v1.ScaleIOVolumeSource",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "ScaleSpecv1": {
     "schemaName": "io.k8s.api.autoscaling.v1.ScaleSpec",
-    "fileName": "apis__apps__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "ScaleStatusv1": {
     "schemaName": "io.k8s.api.autoscaling.v1.ScaleStatus",
-    "fileName": "apis__apps__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "Scalev1": {
     "schemaName": "io.k8s.api.autoscaling.v1.Scale",
-    "fileName": "apis__apps__v1_openapi.json",
+    "fileName": "api__v1_openapi.json",
     "gvk": [
       {
         "group": "autoscaling",
@@ -2649,19 +2651,19 @@
   },
   "SeccompProfilev1": {
     "schemaName": "io.k8s.api.core.v1.SeccompProfile",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "SecretEnvSourcev1": {
     "schemaName": "io.k8s.api.core.v1.SecretEnvSource",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "SecretKeySelectorv1": {
     "schemaName": "io.k8s.api.core.v1.SecretKeySelector",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "SecretProjectionv1": {
     "schemaName": "io.k8s.api.core.v1.SecretProjection",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "SecretReferencev1": {
     "schemaName": "io.k8s.api.core.v1.SecretReference",
@@ -2669,7 +2671,7 @@
   },
   "SecretVolumeSourcev1": {
     "schemaName": "io.k8s.api.core.v1.SecretVolumeSource",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "Secretv1": {
     "schemaName": "io.k8s.api.core.v1.Secret",
@@ -2686,7 +2688,7 @@
   },
   "SecurityContextv1": {
     "schemaName": "io.k8s.api.core.v1.SecurityContext",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "SelectableFieldv1": {
     "schemaName": "io.k8s.apiextensions-apiserver.pkg.apis.apiextensions.v1.SelectableField",
@@ -2762,7 +2764,7 @@
   },
   "ServerAddressByClientCIDRv1": {
     "schemaName": "io.k8s.apimachinery.pkg.apis.meta.v1.ServerAddressByClientCIDR",
-    "fileName": "apis_openapi.json"
+    "fileName": "apis__authentication.k8s.io_openapi.json"
   },
   "ServerStorageVersionv1alpha1": {
     "schemaName": "io.k8s.api.apiserverinternal.v1alpha1.ServerStorageVersion",
@@ -2774,7 +2776,7 @@
   },
   "ServiceAccountTokenProjectionv1": {
     "schemaName": "io.k8s.api.core.v1.ServiceAccountTokenProjection",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "ServiceAccountv1": {
     "schemaName": "io.k8s.api.core.v1.ServiceAccount",
@@ -2845,7 +2847,7 @@
   },
   "SleepActionv1": {
     "schemaName": "io.k8s.api.core.v1.SleepAction",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "StatefulSetConditionv1": {
     "schemaName": "io.k8s.api.apps.v1.StatefulSetCondition",
@@ -2886,15 +2888,15 @@
   },
   "StatusCausev1": {
     "schemaName": "io.k8s.apimachinery.pkg.apis.meta.v1.StatusCause",
-    "fileName": "apis__storagemigration.k8s.io__v1alpha1_openapi.json"
+    "fileName": "apis__resource.k8s.io__v1alpha3_openapi.json"
   },
   "StatusDetailsv1": {
     "schemaName": "io.k8s.apimachinery.pkg.apis.meta.v1.StatusDetails",
-    "fileName": "apis__storagemigration.k8s.io__v1alpha1_openapi.json"
+    "fileName": "apis__resource.k8s.io__v1alpha3_openapi.json"
   },
   "Statusv1": {
     "schemaName": "io.k8s.apimachinery.pkg.apis.meta.v1.Status",
-    "fileName": "apis__storagemigration.k8s.io__v1alpha1_openapi.json",
+    "fileName": "apis__resource.k8s.io__v1alpha3_openapi.json",
     "gvk": [
       {
         "group": "",
@@ -2922,7 +2924,7 @@
   },
   "StorageOSVolumeSourcev1": {
     "schemaName": "io.k8s.api.core.v1.StorageOSVolumeSource",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "StorageTokenRequestv1": {
     "schemaName": "io.k8s.api.storage.v1.TokenRequest",
@@ -3009,11 +3011,11 @@
   },
   "Sysctlv1": {
     "schemaName": "io.k8s.api.core.v1.Sysctl",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "TCPSocketActionv1": {
     "schemaName": "io.k8s.api.core.v1.TCPSocketAction",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "Taintv1": {
     "schemaName": "io.k8s.api.core.v1.Taint",
@@ -3021,7 +3023,7 @@
   },
   "Timev1": {
     "schemaName": "io.k8s.apimachinery.pkg.apis.meta.v1.Time",
-    "fileName": "apis__storagemigration.k8s.io__v1alpha1_openapi.json"
+    "fileName": "apis__resource.k8s.io__v1alpha3_openapi.json"
   },
   "TokenRequestSpecv1": {
     "schemaName": "io.k8s.api.authentication.v1.TokenRequestSpec",
@@ -3054,7 +3056,7 @@
   },
   "Tolerationv1": {
     "schemaName": "io.k8s.api.core.v1.Toleration",
-    "fileName": "apis__node.k8s.io__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "TopologySelectorLabelRequirementv1": {
     "schemaName": "io.k8s.api.core.v1.TopologySelectorLabelRequirement",
@@ -3066,7 +3068,7 @@
   },
   "TopologySpreadConstraintv1": {
     "schemaName": "io.k8s.api.core.v1.TopologySpreadConstraint",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "TypeCheckingv1": {
     "schemaName": "io.k8s.api.admissionregistration.v1.TypeChecking",
@@ -3082,7 +3084,7 @@
   },
   "TypedObjectReferencev1": {
     "schemaName": "io.k8s.api.core.v1.TypedObjectReference",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "UncountedTerminatedPodsv1": {
     "schemaName": "io.k8s.api.batch.v1.UncountedTerminatedPods",
@@ -3090,7 +3092,7 @@
   },
   "UserInfov1": {
     "schemaName": "io.k8s.api.authentication.v1.UserInfo",
-    "fileName": "apis__authentication.k8s.io__v1beta1_openapi.json"
+    "fileName": "apis__authentication.k8s.io__v1_openapi.json"
   },
   "UserSubjectv1": {
     "schemaName": "io.k8s.api.flowcontrol.v1.UserSubject",
@@ -3266,7 +3268,7 @@
   },
   "VolumeDevicev1": {
     "schemaName": "io.k8s.api.core.v1.VolumeDevice",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "VolumeErrorv1": {
     "schemaName": "io.k8s.api.storage.v1.VolumeError",
@@ -3278,7 +3280,7 @@
   },
   "VolumeMountv1": {
     "schemaName": "io.k8s.api.core.v1.VolumeMount",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "VolumeNodeAffinityv1": {
     "schemaName": "io.k8s.api.core.v1.VolumeNodeAffinity",
@@ -3290,15 +3292,15 @@
   },
   "VolumeProjectionv1": {
     "schemaName": "io.k8s.api.core.v1.VolumeProjection",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "VolumeResourceRequirementsv1": {
     "schemaName": "io.k8s.api.core.v1.VolumeResourceRequirements",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "Volumev1": {
     "schemaName": "io.k8s.api.core.v1.Volume",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "VsphereVirtualDiskVolumeSourcev1": {
     "schemaName": "io.k8s.api.core.v1.VsphereVirtualDiskVolumeSource",
@@ -3306,7 +3308,7 @@
   },
   "WatchEventv1": {
     "schemaName": "io.k8s.apimachinery.pkg.apis.meta.v1.WatchEvent",
-    "fileName": "apis__storagemigration.k8s.io__v1alpha1_openapi.json",
+    "fileName": "apis__resource.k8s.io__v1alpha3_openapi.json",
     "gvk": [
       {
         "group": "",
@@ -3621,10 +3623,10 @@
   },
   "WeightedPodAffinityTermv1": {
     "schemaName": "io.k8s.api.core.v1.WeightedPodAffinityTerm",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   },
   "WindowsSecurityContextOptionsv1": {
     "schemaName": "io.k8s.api.core.v1.WindowsSecurityContextOptions",
-    "fileName": "apis__batch__v1_openapi.json"
+    "fileName": "api__v1_openapi.json"
   }
 }
\ No newline at end of file
diff --git a/packages/cli/src/generateCore.ts b/packages/cli/src/generateCore.ts
index 6c5411d..ba0f8b0 100644
--- a/packages/cli/src/generateCore.ts
+++ b/packages/cli/src/generateCore.ts
@@ -221,8 +221,10 @@ function morph() {
                         }
                         if (prop.getName() === 'metadata') {
                             interfaceProp.hasQuestionToken = true;
-                            c.statements.push('this.metadata = args.metadata || { name };');
-                            c.statements.push('this.metadata.name ??= name;');
+                            c.statements.push('this.metadata = {');
+                            c.statements.push('  name: args.metadata?.name || name,');
+                            c.statements.push('  ...args.metadata,');
+                            c.statements.push('};');
                             prop.setHasQuestionToken(false);
                             if (groupVersionKindMap[className].namespaced) {
                                 classDeclaration.setExtends('NamespacedApiObject');
diff --git a/packages/core/src/models/APIServicev1.ts b/packages/core/src/models/APIServicev1.ts
index 5419f2d..0a4fde5 100644
--- a/packages/core/src/models/APIServicev1.ts
+++ b/packages/core/src/models/APIServicev1.ts
@@ -31,8 +31,10 @@ export class APIServicev1 extends ApiObject {
 
   constructor(app: K8sApp, name: string, args: APIServicev1Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     this.spec = args.spec;
     app.addResource(this);
   }
diff --git a/packages/core/src/models/AuthenticationTokenRequestv1.ts b/packages/core/src/models/AuthenticationTokenRequestv1.ts
index 3372fc6..a91b9de 100644
--- a/packages/core/src/models/AuthenticationTokenRequestv1.ts
+++ b/packages/core/src/models/AuthenticationTokenRequestv1.ts
@@ -30,8 +30,10 @@ export class AuthenticationTokenRequestv1 extends NamespacedApiObject {
 
   constructor(app: K8sApp, name: string, args: AuthenticationTokenRequestv1Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     this.spec = args.spec;
     app.addResource(this);
   }
diff --git a/packages/core/src/models/Bindingv1.ts b/packages/core/src/models/Bindingv1.ts
index 9e83613..dcc0fb5 100644
--- a/packages/core/src/models/Bindingv1.ts
+++ b/packages/core/src/models/Bindingv1.ts
@@ -30,8 +30,10 @@ export class Bindingv1 extends NamespacedApiObject {
 
   constructor(app: K8sApp, name: string, args: Bindingv1Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     this.target = args.target;
     app.addResource(this);
   }
diff --git a/packages/core/src/models/CSIDriverv1.ts b/packages/core/src/models/CSIDriverv1.ts
index d03ba4b..c9fabb5 100644
--- a/packages/core/src/models/CSIDriverv1.ts
+++ b/packages/core/src/models/CSIDriverv1.ts
@@ -31,8 +31,10 @@ export class CSIDriverv1 extends ApiObject {
 
   constructor(app: K8sApp, name: string, args: CSIDriverv1Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     this.spec = args.spec;
     app.addResource(this);
   }
diff --git a/packages/core/src/models/CSINodev1.ts b/packages/core/src/models/CSINodev1.ts
index 9d34085..9ddb8f9 100644
--- a/packages/core/src/models/CSINodev1.ts
+++ b/packages/core/src/models/CSINodev1.ts
@@ -31,8 +31,10 @@ export class CSINodev1 extends ApiObject {
 
   constructor(app: K8sApp, name: string, args: CSINodev1Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     this.spec = args.spec;
     app.addResource(this);
   }
diff --git a/packages/core/src/models/CSIStorageCapacityv1.ts b/packages/core/src/models/CSIStorageCapacityv1.ts
index 8269dfa..1256123 100644
--- a/packages/core/src/models/CSIStorageCapacityv1.ts
+++ b/packages/core/src/models/CSIStorageCapacityv1.ts
@@ -45,8 +45,10 @@ export class CSIStorageCapacityv1 extends NamespacedApiObject {
 
   constructor(app: K8sApp, name: string, args: CSIStorageCapacityv1Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     this.capacity = args.capacity;
     this.maximumVolumeSize = args.maximumVolumeSize;
     this.nodeTopology = args.nodeTopology;
diff --git a/packages/core/src/models/CertificateSigningRequestv1.ts b/packages/core/src/models/CertificateSigningRequestv1.ts
index abe7037..cac3e5c 100644
--- a/packages/core/src/models/CertificateSigningRequestv1.ts
+++ b/packages/core/src/models/CertificateSigningRequestv1.ts
@@ -28,8 +28,10 @@ export class CertificateSigningRequestv1 extends ApiObject {
 
   constructor(app: K8sApp, name: string, args: CertificateSigningRequestv1Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     this.spec = args.spec;
     app.addResource(this);
   }
diff --git a/packages/core/src/models/ClusterRoleBindingv1.ts b/packages/core/src/models/ClusterRoleBindingv1.ts
index 22d9ec3..cdb4297 100644
--- a/packages/core/src/models/ClusterRoleBindingv1.ts
+++ b/packages/core/src/models/ClusterRoleBindingv1.ts
@@ -37,8 +37,10 @@ export class ClusterRoleBindingv1 extends ApiObject {
 
   constructor(app: K8sApp, name: string, args: ClusterRoleBindingv1Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     this.roleRef = args.roleRef;
     this.subjects = args.subjects;
     app.addResource(this);
diff --git a/packages/core/src/models/ClusterRolev1.ts b/packages/core/src/models/ClusterRolev1.ts
index 173d0ad..b5f86a4 100644
--- a/packages/core/src/models/ClusterRolev1.ts
+++ b/packages/core/src/models/ClusterRolev1.ts
@@ -37,8 +37,10 @@ export class ClusterRolev1 extends ApiObject {
 
   constructor(app: K8sApp, name: string, args: ClusterRolev1Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     this.aggregationRule = args.aggregationRule;
     this.rules = args.rules;
     app.addResource(this);
diff --git a/packages/core/src/models/ClusterTrustBundlev1alpha1.ts b/packages/core/src/models/ClusterTrustBundlev1alpha1.ts
index 50b617b..635a777 100644
--- a/packages/core/src/models/ClusterTrustBundlev1alpha1.ts
+++ b/packages/core/src/models/ClusterTrustBundlev1alpha1.ts
@@ -31,8 +31,10 @@ export class ClusterTrustBundlev1alpha1 extends ApiObject {
 
   constructor(app: K8sApp, name: string, args: ClusterTrustBundlev1alpha1Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     this.spec = args.spec;
     app.addResource(this);
   }
diff --git a/packages/core/src/models/ConfigMapv1.ts b/packages/core/src/models/ConfigMapv1.ts
index ddbaaf2..5e54a3a 100644
--- a/packages/core/src/models/ConfigMapv1.ts
+++ b/packages/core/src/models/ConfigMapv1.ts
@@ -39,8 +39,10 @@ export class ConfigMapv1 extends NamespacedApiObject {
 
   constructor(app: K8sApp, name: string, args: ConfigMapv1Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     this.binaryData = args.binaryData;
     this.data = args.data;
     this.immutable = args.immutable;
diff --git a/packages/core/src/models/ControllerRevisionv1.ts b/packages/core/src/models/ControllerRevisionv1.ts
index 5ba494f..51f6773 100644
--- a/packages/core/src/models/ControllerRevisionv1.ts
+++ b/packages/core/src/models/ControllerRevisionv1.ts
@@ -34,8 +34,10 @@ export class ControllerRevisionv1 extends NamespacedApiObject {
 
   constructor(app: K8sApp, name: string, args: ControllerRevisionv1Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     this.data = args.data;
     this.revision = args.revision;
     app.addResource(this);
diff --git a/packages/core/src/models/CoreEventv1.ts b/packages/core/src/models/CoreEventv1.ts
index 81f6e1c..7fac884 100644
--- a/packages/core/src/models/CoreEventv1.ts
+++ b/packages/core/src/models/CoreEventv1.ts
@@ -97,8 +97,10 @@ export class CoreEventv1 extends NamespacedApiObject {
 
   constructor(app: K8sApp, name: string, args: CoreEventv1Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     this.action = args.action;
     this.count = args.count;
     this.eventTime = args.eventTime;
diff --git a/packages/core/src/models/CronJobv1.ts b/packages/core/src/models/CronJobv1.ts
index 2184add..06bf469 100644
--- a/packages/core/src/models/CronJobv1.ts
+++ b/packages/core/src/models/CronJobv1.ts
@@ -30,8 +30,10 @@ export class CronJobv1 extends NamespacedApiObject {
 
   constructor(app: K8sApp, name: string, args: CronJobv1Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     this.spec = args.spec;
     app.addResource(this);
   }
diff --git a/packages/core/src/models/CustomResourceDefinitionv1.ts b/packages/core/src/models/CustomResourceDefinitionv1.ts
index 8d200e4..2b069de 100644
--- a/packages/core/src/models/CustomResourceDefinitionv1.ts
+++ b/packages/core/src/models/CustomResourceDefinitionv1.ts
@@ -31,8 +31,10 @@ export class CustomResourceDefinitionv1 extends ApiObject {
 
   constructor(app: K8sApp, name: string, args: CustomResourceDefinitionv1Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     this.spec = args.spec;
     app.addResource(this);
   }
diff --git a/packages/core/src/models/DaemonSetv1.ts b/packages/core/src/models/DaemonSetv1.ts
index 7c71722..137e8e9 100644
--- a/packages/core/src/models/DaemonSetv1.ts
+++ b/packages/core/src/models/DaemonSetv1.ts
@@ -30,8 +30,10 @@ export class DaemonSetv1 extends NamespacedApiObject {
 
   constructor(app: K8sApp, name: string, args: DaemonSetv1Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     this.spec = args.spec;
     app.addResource(this);
   }
diff --git a/packages/core/src/models/Deploymentv1.ts b/packages/core/src/models/Deploymentv1.ts
index 108049a..0b10cea 100644
--- a/packages/core/src/models/Deploymentv1.ts
+++ b/packages/core/src/models/Deploymentv1.ts
@@ -30,8 +30,10 @@ export class Deploymentv1 extends NamespacedApiObject {
 
   constructor(app: K8sApp, name: string, args: Deploymentv1Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     this.spec = args.spec;
     app.addResource(this);
   }
diff --git a/packages/core/src/models/DeviceClassv1alpha3.ts b/packages/core/src/models/DeviceClassv1alpha3.ts
index dad4c24..72b47b4 100644
--- a/packages/core/src/models/DeviceClassv1alpha3.ts
+++ b/packages/core/src/models/DeviceClassv1alpha3.ts
@@ -31,8 +31,10 @@ export class DeviceClassv1alpha3 extends ApiObject {
 
   constructor(app: K8sApp, name: string, args: DeviceClassv1alpha3Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     this.spec = args.spec;
     app.addResource(this);
   }
diff --git a/packages/core/src/models/DeviceClassv1beta1.ts b/packages/core/src/models/DeviceClassv1beta1.ts
index 45c0d1c..b3f00f3 100644
--- a/packages/core/src/models/DeviceClassv1beta1.ts
+++ b/packages/core/src/models/DeviceClassv1beta1.ts
@@ -31,8 +31,10 @@ export class DeviceClassv1beta1 extends ApiObject {
 
   constructor(app: K8sApp, name: string, args: DeviceClassv1beta1Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     this.spec = args.spec;
     app.addResource(this);
   }
diff --git a/packages/core/src/models/EndpointSlicev1.ts b/packages/core/src/models/EndpointSlicev1.ts
index ca98b27..f44a121 100644
--- a/packages/core/src/models/EndpointSlicev1.ts
+++ b/packages/core/src/models/EndpointSlicev1.ts
@@ -41,8 +41,10 @@ export class EndpointSlicev1 extends NamespacedApiObject {
 
   constructor(app: K8sApp, name: string, args: EndpointSlicev1Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     this.addressType = args.addressType;
     this.endpoints = args.endpoints;
     this.ports = args.ports;
diff --git a/packages/core/src/models/Endpointsv1.ts b/packages/core/src/models/Endpointsv1.ts
index b2feb61..2360365 100644
--- a/packages/core/src/models/Endpointsv1.ts
+++ b/packages/core/src/models/Endpointsv1.ts
@@ -30,8 +30,10 @@ export class Endpointsv1 extends NamespacedApiObject {
 
   constructor(app: K8sApp, name: string, args: Endpointsv1Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     this.subsets = args.subsets;
     app.addResource(this);
   }
diff --git a/packages/core/src/models/EventsEventv1.ts b/packages/core/src/models/EventsEventv1.ts
index 4a320f2..4302c23 100644
--- a/packages/core/src/models/EventsEventv1.ts
+++ b/packages/core/src/models/EventsEventv1.ts
@@ -97,8 +97,10 @@ export class EventsEventv1 extends NamespacedApiObject {
 
   constructor(app: K8sApp, name: string, args: EventsEventv1Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     this.action = args.action;
     this.deprecatedCount = args.deprecatedCount;
     this.deprecatedFirstTimestamp = args.deprecatedFirstTimestamp;
diff --git a/packages/core/src/models/Evictionv1.ts b/packages/core/src/models/Evictionv1.ts
index 7aa9808..1110e4f 100644
--- a/packages/core/src/models/Evictionv1.ts
+++ b/packages/core/src/models/Evictionv1.ts
@@ -30,8 +30,10 @@ export class Evictionv1 extends NamespacedApiObject {
 
   constructor(app: K8sApp, name: string, args: Evictionv1Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     this.deleteOptions = args.deleteOptions;
     app.addResource(this);
   }
diff --git a/packages/core/src/models/FlowSchemav1.ts b/packages/core/src/models/FlowSchemav1.ts
index c0bc8d8..0aafeed 100644
--- a/packages/core/src/models/FlowSchemav1.ts
+++ b/packages/core/src/models/FlowSchemav1.ts
@@ -31,8 +31,10 @@ export class FlowSchemav1 extends ApiObject {
 
   constructor(app: K8sApp, name: string, args: FlowSchemav1Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     this.spec = args.spec;
     app.addResource(this);
   }
diff --git a/packages/core/src/models/HorizontalPodAutoscalerv1.ts b/packages/core/src/models/HorizontalPodAutoscalerv1.ts
index 7ecf97b..9706b19 100644
--- a/packages/core/src/models/HorizontalPodAutoscalerv1.ts
+++ b/packages/core/src/models/HorizontalPodAutoscalerv1.ts
@@ -30,8 +30,10 @@ export class HorizontalPodAutoscalerv1 extends NamespacedApiObject {
 
   constructor(app: K8sApp, name: string, args: HorizontalPodAutoscalerv1Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     this.spec = args.spec;
     app.addResource(this);
   }
diff --git a/packages/core/src/models/HorizontalPodAutoscalerv2.ts b/packages/core/src/models/HorizontalPodAutoscalerv2.ts
index 65b7699..ec59e62 100644
--- a/packages/core/src/models/HorizontalPodAutoscalerv2.ts
+++ b/packages/core/src/models/HorizontalPodAutoscalerv2.ts
@@ -30,8 +30,10 @@ export class HorizontalPodAutoscalerv2 extends NamespacedApiObject {
 
   constructor(app: K8sApp, name: string, args: HorizontalPodAutoscalerv2Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     this.spec = args.spec;
     app.addResource(this);
   }
diff --git a/packages/core/src/models/IPAddressv1beta1.ts b/packages/core/src/models/IPAddressv1beta1.ts
index 8593ea5..d7ac69b 100644
--- a/packages/core/src/models/IPAddressv1beta1.ts
+++ b/packages/core/src/models/IPAddressv1beta1.ts
@@ -31,8 +31,10 @@ export class IPAddressv1beta1 extends ApiObject {
 
   constructor(app: K8sApp, name: string, args: IPAddressv1beta1Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     this.spec = args.spec;
     app.addResource(this);
   }
diff --git a/packages/core/src/models/IngressClassv1.ts b/packages/core/src/models/IngressClassv1.ts
index cb7b1fe..69ca05f 100644
--- a/packages/core/src/models/IngressClassv1.ts
+++ b/packages/core/src/models/IngressClassv1.ts
@@ -31,8 +31,10 @@ export class IngressClassv1 extends ApiObject {
 
   constructor(app: K8sApp, name: string, args: IngressClassv1Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     this.spec = args.spec;
     app.addResource(this);
   }
diff --git a/packages/core/src/models/Ingressv1.ts b/packages/core/src/models/Ingressv1.ts
index b00bb0c..9186e19 100644
--- a/packages/core/src/models/Ingressv1.ts
+++ b/packages/core/src/models/Ingressv1.ts
@@ -30,8 +30,10 @@ export class Ingressv1 extends NamespacedApiObject {
 
   constructor(app: K8sApp, name: string, args: Ingressv1Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     this.spec = args.spec;
     app.addResource(this);
   }
diff --git a/packages/core/src/models/Jobv1.ts b/packages/core/src/models/Jobv1.ts
index 707d9f8..56d1e15 100644
--- a/packages/core/src/models/Jobv1.ts
+++ b/packages/core/src/models/Jobv1.ts
@@ -30,8 +30,10 @@ export class Jobv1 extends NamespacedApiObject {
 
   constructor(app: K8sApp, name: string, args: Jobv1Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     this.spec = args.spec;
     app.addResource(this);
   }
diff --git a/packages/core/src/models/LeaseCandidatev1alpha2.ts b/packages/core/src/models/LeaseCandidatev1alpha2.ts
index 9dd33d7..da31f8e 100644
--- a/packages/core/src/models/LeaseCandidatev1alpha2.ts
+++ b/packages/core/src/models/LeaseCandidatev1alpha2.ts
@@ -30,8 +30,10 @@ export class LeaseCandidatev1alpha2 extends NamespacedApiObject {
 
   constructor(app: K8sApp, name: string, args: LeaseCandidatev1alpha2Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     this.spec = args.spec;
     app.addResource(this);
   }
diff --git a/packages/core/src/models/Leasev1.ts b/packages/core/src/models/Leasev1.ts
index f8a1444..929ff79 100644
--- a/packages/core/src/models/Leasev1.ts
+++ b/packages/core/src/models/Leasev1.ts
@@ -30,8 +30,10 @@ export class Leasev1 extends NamespacedApiObject {
 
   constructor(app: K8sApp, name: string, args: Leasev1Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     this.spec = args.spec;
     app.addResource(this);
   }
diff --git a/packages/core/src/models/LimitRangev1.ts b/packages/core/src/models/LimitRangev1.ts
index b57f5db..de04029 100644
--- a/packages/core/src/models/LimitRangev1.ts
+++ b/packages/core/src/models/LimitRangev1.ts
@@ -30,8 +30,10 @@ export class LimitRangev1 extends NamespacedApiObject {
 
   constructor(app: K8sApp, name: string, args: LimitRangev1Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     this.spec = args.spec;
     app.addResource(this);
   }
diff --git a/packages/core/src/models/LocalSubjectAccessReviewv1.ts b/packages/core/src/models/LocalSubjectAccessReviewv1.ts
index 02bfcd9..58190e1 100644
--- a/packages/core/src/models/LocalSubjectAccessReviewv1.ts
+++ b/packages/core/src/models/LocalSubjectAccessReviewv1.ts
@@ -30,8 +30,10 @@ export class LocalSubjectAccessReviewv1 extends NamespacedApiObject {
 
   constructor(app: K8sApp, name: string, args: LocalSubjectAccessReviewv1Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     this.spec = args.spec;
     app.addResource(this);
   }
diff --git a/packages/core/src/models/MutatingAdmissionPolicyBindingv1alpha1.ts b/packages/core/src/models/MutatingAdmissionPolicyBindingv1alpha1.ts
index 384a309..146a874 100644
--- a/packages/core/src/models/MutatingAdmissionPolicyBindingv1alpha1.ts
+++ b/packages/core/src/models/MutatingAdmissionPolicyBindingv1alpha1.ts
@@ -31,8 +31,10 @@ export class MutatingAdmissionPolicyBindingv1alpha1 extends ApiObject {
 
   constructor(app: K8sApp, name: string, args: MutatingAdmissionPolicyBindingv1alpha1Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     this.spec = args.spec;
     app.addResource(this);
   }
diff --git a/packages/core/src/models/MutatingAdmissionPolicyv1alpha1.ts b/packages/core/src/models/MutatingAdmissionPolicyv1alpha1.ts
index 372af9d..becea72 100644
--- a/packages/core/src/models/MutatingAdmissionPolicyv1alpha1.ts
+++ b/packages/core/src/models/MutatingAdmissionPolicyv1alpha1.ts
@@ -31,8 +31,10 @@ export class MutatingAdmissionPolicyv1alpha1 extends ApiObject {
 
   constructor(app: K8sApp, name: string, args: MutatingAdmissionPolicyv1alpha1Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     this.spec = args.spec;
     app.addResource(this);
   }
diff --git a/packages/core/src/models/MutatingWebhookConfigurationv1.ts b/packages/core/src/models/MutatingWebhookConfigurationv1.ts
index 7ef01cc..dd26432 100644
--- a/packages/core/src/models/MutatingWebhookConfigurationv1.ts
+++ b/packages/core/src/models/MutatingWebhookConfigurationv1.ts
@@ -31,8 +31,10 @@ export class MutatingWebhookConfigurationv1 extends ApiObject {
 
   constructor(app: K8sApp, name: string, args: MutatingWebhookConfigurationv1Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     this.webhooks = args.webhooks;
     app.addResource(this);
   }
diff --git a/packages/core/src/models/Namespacev1.ts b/packages/core/src/models/Namespacev1.ts
index c474523..2cb55d5 100644
--- a/packages/core/src/models/Namespacev1.ts
+++ b/packages/core/src/models/Namespacev1.ts
@@ -31,8 +31,10 @@ export class Namespacev1 extends ApiObject {
 
   constructor(app: K8sApp, name: string, args: Namespacev1Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     this.spec = args.spec;
     app.addResource(this);
   }
diff --git a/packages/core/src/models/NetworkPolicyv1.ts b/packages/core/src/models/NetworkPolicyv1.ts
index 6118a41..3e9e5e1 100644
--- a/packages/core/src/models/NetworkPolicyv1.ts
+++ b/packages/core/src/models/NetworkPolicyv1.ts
@@ -30,8 +30,10 @@ export class NetworkPolicyv1 extends NamespacedApiObject {
 
   constructor(app: K8sApp, name: string, args: NetworkPolicyv1Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     this.spec = args.spec;
     app.addResource(this);
   }
diff --git a/packages/core/src/models/Nodev1.ts b/packages/core/src/models/Nodev1.ts
index aaa8067..ca8e108 100644
--- a/packages/core/src/models/Nodev1.ts
+++ b/packages/core/src/models/Nodev1.ts
@@ -31,8 +31,10 @@ export class Nodev1 extends ApiObject {
 
   constructor(app: K8sApp, name: string, args: Nodev1Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     this.spec = args.spec;
     app.addResource(this);
   }
diff --git a/packages/core/src/models/PersistentVolumeClaimv1.ts b/packages/core/src/models/PersistentVolumeClaimv1.ts
index d710b98..17f2311 100644
--- a/packages/core/src/models/PersistentVolumeClaimv1.ts
+++ b/packages/core/src/models/PersistentVolumeClaimv1.ts
@@ -1,24 +1,40 @@
-import { ObjectMetav1 } from './ObjectMetav1.js';
 import { PersistentVolumeClaimSpecv1 } from './PersistentVolumeClaimSpecv1.js';
+import { K8sApp } from '../K8sApp.js';
+import { NamespacedObjectMetav1, NamespacedApiObject } from '../ApiObject.js';
+
+export interface PersistentVolumeClaimv1Args {
+  readonly metadata?: NamespacedObjectMetav1;
+  readonly spec?: PersistentVolumeClaimSpecv1;
+}
 
 /**
  * PersistentVolumeClaim is a user\'s request for and claim to a persistent volume
  */
-export interface PersistentVolumeClaimv1 {
+export class PersistentVolumeClaimv1 extends NamespacedApiObject {
   /**
    * APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
    */
-  apiVersion?: string;
+  readonly apiVersion = 'v1';
   /**
    * Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
    */
-  kind?: string;
+  readonly kind = 'PersistentVolumeClaim';
   /**
    * Standard object\'s metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata
    */
-  metadata?: ObjectMetav1;
+  readonly metadata: NamespacedObjectMetav1;
   /**
    * spec defines the desired characteristics of a volume requested by a pod author. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims
    */
-  spec?: PersistentVolumeClaimSpecv1;
+  readonly spec?: PersistentVolumeClaimSpecv1;
+
+  constructor(app: K8sApp, name: string, args: PersistentVolumeClaimv1Args) {
+    super(args.metadata?.name || name);
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
+    this.spec = args.spec;
+    app.addResource(this);
+  }
 }
diff --git a/packages/core/src/models/PersistentVolumev1.ts b/packages/core/src/models/PersistentVolumev1.ts
index c38e279..ef2a135 100644
--- a/packages/core/src/models/PersistentVolumev1.ts
+++ b/packages/core/src/models/PersistentVolumev1.ts
@@ -31,8 +31,10 @@ export class PersistentVolumev1 extends ApiObject {
 
   constructor(app: K8sApp, name: string, args: PersistentVolumev1Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     this.spec = args.spec;
     app.addResource(this);
   }
diff --git a/packages/core/src/models/PodDisruptionBudgetv1.ts b/packages/core/src/models/PodDisruptionBudgetv1.ts
index bd60667..e1fa362 100644
--- a/packages/core/src/models/PodDisruptionBudgetv1.ts
+++ b/packages/core/src/models/PodDisruptionBudgetv1.ts
@@ -30,8 +30,10 @@ export class PodDisruptionBudgetv1 extends NamespacedApiObject {
 
   constructor(app: K8sApp, name: string, args: PodDisruptionBudgetv1Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     this.spec = args.spec;
     app.addResource(this);
   }
diff --git a/packages/core/src/models/PodTemplatev1.ts b/packages/core/src/models/PodTemplatev1.ts
index 6591004..d0440f4 100644
--- a/packages/core/src/models/PodTemplatev1.ts
+++ b/packages/core/src/models/PodTemplatev1.ts
@@ -30,8 +30,10 @@ export class PodTemplatev1 extends NamespacedApiObject {
 
   constructor(app: K8sApp, name: string, args: PodTemplatev1Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     this.template = args.template;
     app.addResource(this);
   }
diff --git a/packages/core/src/models/Podv1.ts b/packages/core/src/models/Podv1.ts
index cba108f..7ef86de 100644
--- a/packages/core/src/models/Podv1.ts
+++ b/packages/core/src/models/Podv1.ts
@@ -30,8 +30,10 @@ export class Podv1 extends NamespacedApiObject {
 
   constructor(app: K8sApp, name: string, args: Podv1Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     this.spec = args.spec;
     app.addResource(this);
   }
diff --git a/packages/core/src/models/PriorityClassv1.ts b/packages/core/src/models/PriorityClassv1.ts
index 0cc5820..3eb2afb 100644
--- a/packages/core/src/models/PriorityClassv1.ts
+++ b/packages/core/src/models/PriorityClassv1.ts
@@ -45,8 +45,10 @@ export class PriorityClassv1 extends ApiObject {
 
   constructor(app: K8sApp, name: string, args: PriorityClassv1Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     this.description = args.description;
     this.globalDefault = args.globalDefault;
     this.preemptionPolicy = args.preemptionPolicy;
diff --git a/packages/core/src/models/PriorityLevelConfigurationv1.ts b/packages/core/src/models/PriorityLevelConfigurationv1.ts
index 7de8734..f4c358f 100644
--- a/packages/core/src/models/PriorityLevelConfigurationv1.ts
+++ b/packages/core/src/models/PriorityLevelConfigurationv1.ts
@@ -31,8 +31,10 @@ export class PriorityLevelConfigurationv1 extends ApiObject {
 
   constructor(app: K8sApp, name: string, args: PriorityLevelConfigurationv1Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     this.spec = args.spec;
     app.addResource(this);
   }
diff --git a/packages/core/src/models/ReplicaSetv1.ts b/packages/core/src/models/ReplicaSetv1.ts
index 6083d73..5797e4a 100644
--- a/packages/core/src/models/ReplicaSetv1.ts
+++ b/packages/core/src/models/ReplicaSetv1.ts
@@ -30,8 +30,10 @@ export class ReplicaSetv1 extends NamespacedApiObject {
 
   constructor(app: K8sApp, name: string, args: ReplicaSetv1Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     this.spec = args.spec;
     app.addResource(this);
   }
diff --git a/packages/core/src/models/ReplicationControllerv1.ts b/packages/core/src/models/ReplicationControllerv1.ts
index a74d798..62db59b 100644
--- a/packages/core/src/models/ReplicationControllerv1.ts
+++ b/packages/core/src/models/ReplicationControllerv1.ts
@@ -30,8 +30,10 @@ export class ReplicationControllerv1 extends NamespacedApiObject {
 
   constructor(app: K8sApp, name: string, args: ReplicationControllerv1Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     this.spec = args.spec;
     app.addResource(this);
   }
diff --git a/packages/core/src/models/ResourceClaimTemplatev1alpha3.ts b/packages/core/src/models/ResourceClaimTemplatev1alpha3.ts
index 7c26542..fabafcf 100644
--- a/packages/core/src/models/ResourceClaimTemplatev1alpha3.ts
+++ b/packages/core/src/models/ResourceClaimTemplatev1alpha3.ts
@@ -30,8 +30,10 @@ export class ResourceClaimTemplatev1alpha3 extends NamespacedApiObject {
 
   constructor(app: K8sApp, name: string, args: ResourceClaimTemplatev1alpha3Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     this.spec = args.spec;
     app.addResource(this);
   }
diff --git a/packages/core/src/models/ResourceClaimTemplatev1beta1.ts b/packages/core/src/models/ResourceClaimTemplatev1beta1.ts
index 6aa8e56..5df1725 100644
--- a/packages/core/src/models/ResourceClaimTemplatev1beta1.ts
+++ b/packages/core/src/models/ResourceClaimTemplatev1beta1.ts
@@ -30,8 +30,10 @@ export class ResourceClaimTemplatev1beta1 extends NamespacedApiObject {
 
   constructor(app: K8sApp, name: string, args: ResourceClaimTemplatev1beta1Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     this.spec = args.spec;
     app.addResource(this);
   }
diff --git a/packages/core/src/models/ResourceClaimv1alpha3.ts b/packages/core/src/models/ResourceClaimv1alpha3.ts
index 463660a..7321337 100644
--- a/packages/core/src/models/ResourceClaimv1alpha3.ts
+++ b/packages/core/src/models/ResourceClaimv1alpha3.ts
@@ -30,8 +30,10 @@ export class ResourceClaimv1alpha3 extends NamespacedApiObject {
 
   constructor(app: K8sApp, name: string, args: ResourceClaimv1alpha3Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     this.spec = args.spec;
     app.addResource(this);
   }
diff --git a/packages/core/src/models/ResourceClaimv1beta1.ts b/packages/core/src/models/ResourceClaimv1beta1.ts
index b9b374c..35fe76f 100644
--- a/packages/core/src/models/ResourceClaimv1beta1.ts
+++ b/packages/core/src/models/ResourceClaimv1beta1.ts
@@ -30,8 +30,10 @@ export class ResourceClaimv1beta1 extends NamespacedApiObject {
 
   constructor(app: K8sApp, name: string, args: ResourceClaimv1beta1Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     this.spec = args.spec;
     app.addResource(this);
   }
diff --git a/packages/core/src/models/ResourceQuotav1.ts b/packages/core/src/models/ResourceQuotav1.ts
index a5d3e3b..ef50405 100644
--- a/packages/core/src/models/ResourceQuotav1.ts
+++ b/packages/core/src/models/ResourceQuotav1.ts
@@ -30,8 +30,10 @@ export class ResourceQuotav1 extends NamespacedApiObject {
 
   constructor(app: K8sApp, name: string, args: ResourceQuotav1Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     this.spec = args.spec;
     app.addResource(this);
   }
diff --git a/packages/core/src/models/ResourceSlicev1alpha3.ts b/packages/core/src/models/ResourceSlicev1alpha3.ts
index da7ddf0..c4b2036 100644
--- a/packages/core/src/models/ResourceSlicev1alpha3.ts
+++ b/packages/core/src/models/ResourceSlicev1alpha3.ts
@@ -31,8 +31,10 @@ export class ResourceSlicev1alpha3 extends ApiObject {
 
   constructor(app: K8sApp, name: string, args: ResourceSlicev1alpha3Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     this.spec = args.spec;
     app.addResource(this);
   }
diff --git a/packages/core/src/models/ResourceSlicev1beta1.ts b/packages/core/src/models/ResourceSlicev1beta1.ts
index 7be887d..a408dc2 100644
--- a/packages/core/src/models/ResourceSlicev1beta1.ts
+++ b/packages/core/src/models/ResourceSlicev1beta1.ts
@@ -31,8 +31,10 @@ export class ResourceSlicev1beta1 extends ApiObject {
 
   constructor(app: K8sApp, name: string, args: ResourceSlicev1beta1Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     this.spec = args.spec;
     app.addResource(this);
   }
diff --git a/packages/core/src/models/RoleBindingv1.ts b/packages/core/src/models/RoleBindingv1.ts
index 20d531f..05dadd9 100644
--- a/packages/core/src/models/RoleBindingv1.ts
+++ b/packages/core/src/models/RoleBindingv1.ts
@@ -36,8 +36,10 @@ export class RoleBindingv1 extends NamespacedApiObject {
 
   constructor(app: K8sApp, name: string, args: RoleBindingv1Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     this.roleRef = args.roleRef;
     this.subjects = args.subjects;
     app.addResource(this);
diff --git a/packages/core/src/models/Rolev1.ts b/packages/core/src/models/Rolev1.ts
index 7371062..ccef14f 100644
--- a/packages/core/src/models/Rolev1.ts
+++ b/packages/core/src/models/Rolev1.ts
@@ -30,8 +30,10 @@ export class Rolev1 extends NamespacedApiObject {
 
   constructor(app: K8sApp, name: string, args: Rolev1Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     this.rules = args.rules;
     app.addResource(this);
   }
diff --git a/packages/core/src/models/RuntimeClassv1.ts b/packages/core/src/models/RuntimeClassv1.ts
index de3b8d5..65101d6 100644
--- a/packages/core/src/models/RuntimeClassv1.ts
+++ b/packages/core/src/models/RuntimeClassv1.ts
@@ -42,8 +42,10 @@ export class RuntimeClassv1 extends ApiObject {
 
   constructor(app: K8sApp, name: string, args: RuntimeClassv1Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     this.handler = args.handler;
     this.overhead = args.overhead;
     this.scheduling = args.scheduling;
diff --git a/packages/core/src/models/Secretv1.ts b/packages/core/src/models/Secretv1.ts
index fc3f493..37bdb90 100644
--- a/packages/core/src/models/Secretv1.ts
+++ b/packages/core/src/models/Secretv1.ts
@@ -44,8 +44,10 @@ export class Secretv1 extends NamespacedApiObject {
 
   constructor(app: K8sApp, name: string, args: Secretv1Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     this.data = args.data;
     this.immutable = args.immutable;
     this.stringData = args.stringData;
diff --git a/packages/core/src/models/SelfSubjectAccessReviewv1.ts b/packages/core/src/models/SelfSubjectAccessReviewv1.ts
index 7668fca..2eabc9a 100644
--- a/packages/core/src/models/SelfSubjectAccessReviewv1.ts
+++ b/packages/core/src/models/SelfSubjectAccessReviewv1.ts
@@ -31,8 +31,10 @@ export class SelfSubjectAccessReviewv1 extends ApiObject {
 
   constructor(app: K8sApp, name: string, args: SelfSubjectAccessReviewv1Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     this.spec = args.spec;
     app.addResource(this);
   }
diff --git a/packages/core/src/models/SelfSubjectReviewv1.ts b/packages/core/src/models/SelfSubjectReviewv1.ts
index 83c9a29..491105c 100644
--- a/packages/core/src/models/SelfSubjectReviewv1.ts
+++ b/packages/core/src/models/SelfSubjectReviewv1.ts
@@ -25,8 +25,10 @@ export class SelfSubjectReviewv1 extends ApiObject {
 
   constructor(app: K8sApp, name: string, args: SelfSubjectReviewv1Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     app.addResource(this);
   }
 }
diff --git a/packages/core/src/models/SelfSubjectReviewv1beta1.ts b/packages/core/src/models/SelfSubjectReviewv1beta1.ts
index 2174761..1ff5867 100644
--- a/packages/core/src/models/SelfSubjectReviewv1beta1.ts
+++ b/packages/core/src/models/SelfSubjectReviewv1beta1.ts
@@ -25,8 +25,10 @@ export class SelfSubjectReviewv1beta1 extends ApiObject {
 
   constructor(app: K8sApp, name: string, args: SelfSubjectReviewv1beta1Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     app.addResource(this);
   }
 }
diff --git a/packages/core/src/models/SelfSubjectRulesReviewv1.ts b/packages/core/src/models/SelfSubjectRulesReviewv1.ts
index f8d1f2a..8208a93 100644
--- a/packages/core/src/models/SelfSubjectRulesReviewv1.ts
+++ b/packages/core/src/models/SelfSubjectRulesReviewv1.ts
@@ -31,8 +31,10 @@ export class SelfSubjectRulesReviewv1 extends ApiObject {
 
   constructor(app: K8sApp, name: string, args: SelfSubjectRulesReviewv1Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     this.spec = args.spec;
     app.addResource(this);
   }
diff --git a/packages/core/src/models/ServiceAccountv1.ts b/packages/core/src/models/ServiceAccountv1.ts
index 827e5bb..d57f452 100644
--- a/packages/core/src/models/ServiceAccountv1.ts
+++ b/packages/core/src/models/ServiceAccountv1.ts
@@ -41,8 +41,10 @@ export class ServiceAccountv1 extends NamespacedApiObject {
 
   constructor(app: K8sApp, name: string, args: ServiceAccountv1Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     this.automountServiceAccountToken = args.automountServiceAccountToken;
     this.imagePullSecrets = args.imagePullSecrets;
     this.secrets = args.secrets;
diff --git a/packages/core/src/models/ServiceCIDRv1beta1.ts b/packages/core/src/models/ServiceCIDRv1beta1.ts
index 4e96cfc..4d6e7cd 100644
--- a/packages/core/src/models/ServiceCIDRv1beta1.ts
+++ b/packages/core/src/models/ServiceCIDRv1beta1.ts
@@ -31,8 +31,10 @@ export class ServiceCIDRv1beta1 extends ApiObject {
 
   constructor(app: K8sApp, name: string, args: ServiceCIDRv1beta1Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     this.spec = args.spec;
     app.addResource(this);
   }
diff --git a/packages/core/src/models/Servicev1.ts b/packages/core/src/models/Servicev1.ts
index 932c1b4..a1b1479 100644
--- a/packages/core/src/models/Servicev1.ts
+++ b/packages/core/src/models/Servicev1.ts
@@ -30,8 +30,10 @@ export class Servicev1 extends NamespacedApiObject {
 
   constructor(app: K8sApp, name: string, args: Servicev1Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     this.spec = args.spec;
     app.addResource(this);
   }
diff --git a/packages/core/src/models/StatefulSetv1.ts b/packages/core/src/models/StatefulSetv1.ts
index ff31422..623d60e 100644
--- a/packages/core/src/models/StatefulSetv1.ts
+++ b/packages/core/src/models/StatefulSetv1.ts
@@ -30,8 +30,10 @@ export class StatefulSetv1 extends NamespacedApiObject {
 
   constructor(app: K8sApp, name: string, args: StatefulSetv1Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     this.spec = args.spec;
     app.addResource(this);
   }
diff --git a/packages/core/src/models/StorageClassv1.ts b/packages/core/src/models/StorageClassv1.ts
index 0c7a4d1..e449e1a 100644
--- a/packages/core/src/models/StorageClassv1.ts
+++ b/packages/core/src/models/StorageClassv1.ts
@@ -61,8 +61,10 @@ export class StorageClassv1 extends ApiObject {
 
   constructor(app: K8sApp, name: string, args: StorageClassv1Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     this.allowVolumeExpansion = args.allowVolumeExpansion;
     this.allowedTopologies = args.allowedTopologies;
     this.mountOptions = args.mountOptions;
diff --git a/packages/core/src/models/StorageVersionMigrationv1alpha1.ts b/packages/core/src/models/StorageVersionMigrationv1alpha1.ts
index 05dc041..10b67c3 100644
--- a/packages/core/src/models/StorageVersionMigrationv1alpha1.ts
+++ b/packages/core/src/models/StorageVersionMigrationv1alpha1.ts
@@ -31,8 +31,10 @@ export class StorageVersionMigrationv1alpha1 extends ApiObject {
 
   constructor(app: K8sApp, name: string, args: StorageVersionMigrationv1alpha1Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     this.spec = args.spec;
     app.addResource(this);
   }
diff --git a/packages/core/src/models/StorageVersionv1alpha1.ts b/packages/core/src/models/StorageVersionv1alpha1.ts
index 2259811..a99aecd 100644
--- a/packages/core/src/models/StorageVersionv1alpha1.ts
+++ b/packages/core/src/models/StorageVersionv1alpha1.ts
@@ -30,8 +30,10 @@ export class StorageVersionv1alpha1 extends ApiObject {
 
   constructor(app: K8sApp, name: string, args: StorageVersionv1alpha1Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     this.spec = args.spec;
     app.addResource(this);
   }
diff --git a/packages/core/src/models/SubjectAccessReviewv1.ts b/packages/core/src/models/SubjectAccessReviewv1.ts
index 411bbc2..3a9d166 100644
--- a/packages/core/src/models/SubjectAccessReviewv1.ts
+++ b/packages/core/src/models/SubjectAccessReviewv1.ts
@@ -31,8 +31,10 @@ export class SubjectAccessReviewv1 extends ApiObject {
 
   constructor(app: K8sApp, name: string, args: SubjectAccessReviewv1Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     this.spec = args.spec;
     app.addResource(this);
   }
diff --git a/packages/core/src/models/TokenReviewv1.ts b/packages/core/src/models/TokenReviewv1.ts
index 6b349c2..268043b 100644
--- a/packages/core/src/models/TokenReviewv1.ts
+++ b/packages/core/src/models/TokenReviewv1.ts
@@ -31,8 +31,10 @@ export class TokenReviewv1 extends ApiObject {
 
   constructor(app: K8sApp, name: string, args: TokenReviewv1Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     this.spec = args.spec;
     app.addResource(this);
   }
diff --git a/packages/core/src/models/ValidatingAdmissionPolicyBindingv1.ts b/packages/core/src/models/ValidatingAdmissionPolicyBindingv1.ts
index 445bc88..7e2b628 100644
--- a/packages/core/src/models/ValidatingAdmissionPolicyBindingv1.ts
+++ b/packages/core/src/models/ValidatingAdmissionPolicyBindingv1.ts
@@ -31,8 +31,10 @@ export class ValidatingAdmissionPolicyBindingv1 extends ApiObject {
 
   constructor(app: K8sApp, name: string, args: ValidatingAdmissionPolicyBindingv1Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     this.spec = args.spec;
     app.addResource(this);
   }
diff --git a/packages/core/src/models/ValidatingAdmissionPolicyBindingv1beta1.ts b/packages/core/src/models/ValidatingAdmissionPolicyBindingv1beta1.ts
index 71ff3b7..e0dac67 100644
--- a/packages/core/src/models/ValidatingAdmissionPolicyBindingv1beta1.ts
+++ b/packages/core/src/models/ValidatingAdmissionPolicyBindingv1beta1.ts
@@ -31,8 +31,10 @@ export class ValidatingAdmissionPolicyBindingv1beta1 extends ApiObject {
 
   constructor(app: K8sApp, name: string, args: ValidatingAdmissionPolicyBindingv1beta1Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     this.spec = args.spec;
     app.addResource(this);
   }
diff --git a/packages/core/src/models/ValidatingAdmissionPolicyv1.ts b/packages/core/src/models/ValidatingAdmissionPolicyv1.ts
index 8ed2842..4fe4c07 100644
--- a/packages/core/src/models/ValidatingAdmissionPolicyv1.ts
+++ b/packages/core/src/models/ValidatingAdmissionPolicyv1.ts
@@ -31,8 +31,10 @@ export class ValidatingAdmissionPolicyv1 extends ApiObject {
 
   constructor(app: K8sApp, name: string, args: ValidatingAdmissionPolicyv1Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     this.spec = args.spec;
     app.addResource(this);
   }
diff --git a/packages/core/src/models/ValidatingAdmissionPolicyv1beta1.ts b/packages/core/src/models/ValidatingAdmissionPolicyv1beta1.ts
index 39aac58..9f49394 100644
--- a/packages/core/src/models/ValidatingAdmissionPolicyv1beta1.ts
+++ b/packages/core/src/models/ValidatingAdmissionPolicyv1beta1.ts
@@ -31,8 +31,10 @@ export class ValidatingAdmissionPolicyv1beta1 extends ApiObject {
 
   constructor(app: K8sApp, name: string, args: ValidatingAdmissionPolicyv1beta1Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     this.spec = args.spec;
     app.addResource(this);
   }
diff --git a/packages/core/src/models/ValidatingWebhookConfigurationv1.ts b/packages/core/src/models/ValidatingWebhookConfigurationv1.ts
index 4277207..ede1304 100644
--- a/packages/core/src/models/ValidatingWebhookConfigurationv1.ts
+++ b/packages/core/src/models/ValidatingWebhookConfigurationv1.ts
@@ -31,8 +31,10 @@ export class ValidatingWebhookConfigurationv1 extends ApiObject {
 
   constructor(app: K8sApp, name: string, args: ValidatingWebhookConfigurationv1Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     this.webhooks = args.webhooks;
     app.addResource(this);
   }
diff --git a/packages/core/src/models/VolumeAttachmentv1.ts b/packages/core/src/models/VolumeAttachmentv1.ts
index 5fbb28f..c2fe8d9 100644
--- a/packages/core/src/models/VolumeAttachmentv1.ts
+++ b/packages/core/src/models/VolumeAttachmentv1.ts
@@ -31,8 +31,10 @@ export class VolumeAttachmentv1 extends ApiObject {
 
   constructor(app: K8sApp, name: string, args: VolumeAttachmentv1Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     this.spec = args.spec;
     app.addResource(this);
   }
diff --git a/packages/core/src/models/VolumeAttributesClassv1alpha1.ts b/packages/core/src/models/VolumeAttributesClassv1alpha1.ts
index f2c3c76..975d1ee 100644
--- a/packages/core/src/models/VolumeAttributesClassv1alpha1.ts
+++ b/packages/core/src/models/VolumeAttributesClassv1alpha1.ts
@@ -35,8 +35,10 @@ export class VolumeAttributesClassv1alpha1 extends ApiObject {
 
   constructor(app: K8sApp, name: string, args: VolumeAttributesClassv1alpha1Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     this.driverName = args.driverName;
     this.parameters = args.parameters;
     app.addResource(this);
diff --git a/packages/core/src/models/VolumeAttributesClassv1beta1.ts b/packages/core/src/models/VolumeAttributesClassv1beta1.ts
index 5a68c6c..cc3cecb 100644
--- a/packages/core/src/models/VolumeAttributesClassv1beta1.ts
+++ b/packages/core/src/models/VolumeAttributesClassv1beta1.ts
@@ -35,8 +35,10 @@ export class VolumeAttributesClassv1beta1 extends ApiObject {
 
   constructor(app: K8sApp, name: string, args: VolumeAttributesClassv1beta1Args) {
     super(args.metadata?.name || name);
-    this.metadata = args.metadata || { name };
-    this.metadata.name ??= name;
+    this.metadata = {
+      name: args.metadata?.name || name,
+      ...args.metadata,
+    };
     this.driverName = args.driverName;
     this.parameters = args.parameters;
     app.addResource(this);