diff --git a/hack/generate-flavors.sh b/hack/generate-flavors.sh
index 38c7c25f..fb7be707 100755
--- a/hack/generate-flavors.sh
+++ b/hack/generate-flavors.sh
@@ -5,7 +5,7 @@ set -euo pipefail
 REPO_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 FLAVORS_DIR="${REPO_ROOT}/templates/flavors"
 
-for name in $(find "${FLAVORS_DIR}/"* -maxdepth 0 -type d -print0 | xargs -0 -I {} basename {} | grep -v base); do
+for name in $(find "${FLAVORS_DIR}/"* -maxdepth 0 -type d -print0 | xargs -0 -I {} basename {} | grep -v base | grep -v clusterclass-base ); do
     # clusterctl expects clusterclass not have the "cluster-template" prefix
     # except for the actual cluster template using the clusterclass
     if [[ "$name" == clusterclass* ]]; then
diff --git a/templates/addons/cluster-resource-set/kustomization.yaml b/templates/addons/cluster-resource-set/kustomization.yaml
index 97a816ad..4eeb3839 100644
--- a/templates/addons/cluster-resource-set/kustomization.yaml
+++ b/templates/addons/cluster-resource-set/kustomization.yaml
@@ -1,4 +1,3 @@
-
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
diff --git a/templates/common-init-files/kustomization.yaml b/templates/common-init-files/kustomization.yaml
index 82ec2100..b002416a 100644
--- a/templates/common-init-files/kustomization.yaml
+++ b/templates/common-init-files/kustomization.yaml
@@ -1,3 +1,4 @@
-namespace: default
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
 resources:
   - secret.yaml
diff --git a/templates/flavors/base/kustomization.yaml b/templates/flavors/base/kustomization.yaml
index f0ec7b5d..f8d5d1e3 100644
--- a/templates/flavors/base/kustomization.yaml
+++ b/templates/flavors/base/kustomization.yaml
@@ -1,8 +1,7 @@
----
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - cluster.yaml
-  - linode-cluster.yaml
-  - linode-machine-template.yaml
-  - machine-deployment.yaml
+  - linodeCluster.yaml
+  - linodeMachineTemplate.yaml
+  - machineDeployment.yaml
diff --git a/templates/flavors/base/linode-cluster.yaml b/templates/flavors/base/linodeCluster.yaml
similarity index 100%
rename from templates/flavors/base/linode-cluster.yaml
rename to templates/flavors/base/linodeCluster.yaml
diff --git a/templates/flavors/base/linode-machine-template.yaml b/templates/flavors/base/linodeMachineTemplate.yaml
similarity index 100%
rename from templates/flavors/base/linode-machine-template.yaml
rename to templates/flavors/base/linodeMachineTemplate.yaml
diff --git a/templates/flavors/base/machine-deployment.yaml b/templates/flavors/base/machineDeployment.yaml
similarity index 100%
rename from templates/flavors/base/machine-deployment.yaml
rename to templates/flavors/base/machineDeployment.yaml
diff --git a/templates/flavors/clusterclass-base/kustomization.yaml b/templates/flavors/clusterclass-base/kustomization.yaml
new file mode 100644
index 00000000..c5119ee4
--- /dev/null
+++ b/templates/flavors/clusterclass-base/kustomization.yaml
@@ -0,0 +1,6 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - linodeClusterTemplate.yaml
+  - linodeMachineControlPlaneTemplate.yaml
+  - linodeMachineWorkerTemplate.yaml
diff --git a/templates/flavors/clusterclass-kubeadm/linode-cluster-template.yaml b/templates/flavors/clusterclass-base/linodeClusterTemplate.yaml
similarity index 100%
rename from templates/flavors/clusterclass-kubeadm/linode-cluster-template.yaml
rename to templates/flavors/clusterclass-base/linodeClusterTemplate.yaml
diff --git a/templates/flavors/clusterclass-kubeadm/linode-machine-controlplane-template.yaml b/templates/flavors/clusterclass-base/linodeMachineControlPlaneTemplate.yaml
similarity index 100%
rename from templates/flavors/clusterclass-kubeadm/linode-machine-controlplane-template.yaml
rename to templates/flavors/clusterclass-base/linodeMachineControlPlaneTemplate.yaml
diff --git a/templates/flavors/clusterclass-kubeadm/linode-machine-worker-template.yaml b/templates/flavors/clusterclass-base/linodeMachineWorkerTemplate.yaml
similarity index 100%
rename from templates/flavors/clusterclass-kubeadm/linode-machine-worker-template.yaml
rename to templates/flavors/clusterclass-base/linodeMachineWorkerTemplate.yaml
diff --git a/templates/flavors/clusterclass-kubeadm/clusterclass.yaml b/templates/flavors/clusterclass-kubeadm/clusterClass.yaml
similarity index 100%
rename from templates/flavors/clusterclass-kubeadm/clusterclass.yaml
rename to templates/flavors/clusterclass-kubeadm/clusterClass.yaml
diff --git a/templates/flavors/clusterclass-kubeadm/kubeadm-config-template.yaml b/templates/flavors/clusterclass-kubeadm/kubeadmConfigTemplate.yaml
similarity index 100%
rename from templates/flavors/clusterclass-kubeadm/kubeadm-config-template.yaml
rename to templates/flavors/clusterclass-kubeadm/kubeadmConfigTemplate.yaml
diff --git a/templates/flavors/clusterclass-kubeadm/kubeadm-controlplane-template.yaml b/templates/flavors/clusterclass-kubeadm/kubeadmControlPlaneTemplate.yaml
similarity index 100%
rename from templates/flavors/clusterclass-kubeadm/kubeadm-controlplane-template.yaml
rename to templates/flavors/clusterclass-kubeadm/kubeadmControlPlaneTemplate.yaml
diff --git a/templates/flavors/clusterclass-kubeadm/kustomization.yaml b/templates/flavors/clusterclass-kubeadm/kustomization.yaml
index 3ead4f48..cac28197 100644
--- a/templates/flavors/clusterclass-kubeadm/kustomization.yaml
+++ b/templates/flavors/clusterclass-kubeadm/kustomization.yaml
@@ -1,10 +1,10 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
 resources:
-  - clusterclass.yaml
-  - linode-cluster-template.yaml
-  - linode-machine-controlplane-template.yaml
-  - linode-machine-worker-template.yaml
-  - kubeadm-controlplane-template.yaml
-  - kubeadm-config-template.yaml
+  - clusterClass.yaml
+  - kubeadmControlPlaneTemplate.yaml
+  - kubeadmConfigTemplate.yaml
+  - ../clusterclass-base
   - ../../common-init-files
   - ../../addons/cilium
   - ../../addons/provider-linode
diff --git a/templates/flavors/default/kubeadm-config-template.yaml b/templates/flavors/default/kubeadmConfigTemplate.yaml
similarity index 100%
rename from templates/flavors/default/kubeadm-config-template.yaml
rename to templates/flavors/default/kubeadmConfigTemplate.yaml
diff --git a/templates/flavors/default/kubeadm-control-plane.yaml b/templates/flavors/default/kubeadmControlPlane.yaml
similarity index 100%
rename from templates/flavors/default/kubeadm-control-plane.yaml
rename to templates/flavors/default/kubeadmControlPlane.yaml
diff --git a/templates/flavors/default/kustomization.yaml b/templates/flavors/default/kustomization.yaml
index 02a8fec5..6b9fe3a3 100644
--- a/templates/flavors/default/kustomization.yaml
+++ b/templates/flavors/default/kustomization.yaml
@@ -1,7 +1,9 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
 resources:
   - ../base
-  - kubeadm-config-template.yaml
-  - kubeadm-control-plane.yaml
+  - kubeadmConfigTemplate.yaml
+  - kubeadmControlPlane.yaml
   - ../../common-init-files
   - ../../addons/cilium
   - ../../addons/provider-linode
diff --git a/templates/flavors/k3s/kustomization.yaml b/templates/flavors/k3s/kustomization.yaml
index 3b8dc792..76801b13 100644
--- a/templates/flavors/k3s/kustomization.yaml
+++ b/templates/flavors/k3s/kustomization.yaml
@@ -1,3 +1,5 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
 resources:
   - ../base
   - k3sControlPlane.yaml
diff --git a/templates/flavors/rke2/kustomization.yaml b/templates/flavors/rke2/kustomization.yaml
index 13fcd042..fdfed62d 100644
--- a/templates/flavors/rke2/kustomization.yaml
+++ b/templates/flavors/rke2/kustomization.yaml
@@ -1,3 +1,5 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
 resources:
   - ../base
   - rke2ControlPlane.yaml