diff --git a/nodes/_defaults.yaml b/nodes/_defaults.yaml
index 1ac19f0..99e821b 100644
--- a/nodes/_defaults.yaml
+++ b/nodes/_defaults.yaml
@@ -25,5 +25,5 @@ patches:
     - !patch install-disk
     - !patch network
     - !patch vip
-patchesControlplane:
-    - !patch allow-controlplane-workloads
+patchesControlPlane:
+    - !patch allow-control-plane-workloads
diff --git a/nodes/hellas/_defaults.yaml b/nodes/hellas/_defaults.yaml
index 57348f9..70e0181 100644
--- a/nodes/hellas/_defaults.yaml
+++ b/nodes/hellas/_defaults.yaml
@@ -1,5 +1,5 @@
 netmask: 255.255.252.0
 gateway: 10.0.0.1
 clusterName: hellas
-controlplaneIp: 10.0.2.1
+controlPlaneIp: 10.0.2.1
 installDisk: /dev/sda
diff --git a/nodes/testing/_defaults.yaml b/nodes/testing/_defaults.yaml
index 63f8183..4ebe1f6 100644
--- a/nodes/testing/_defaults.yaml
+++ b/nodes/testing/_defaults.yaml
@@ -1,5 +1,5 @@
 netmask: 255.255.255.0
 gateway: 192.168.1.1
 clusterName: testing
-controlplaneIp: 192.168.1.100
+controlPlaneIp: 192.168.1.100
 installDisk: /dev/vda
diff --git a/patches/allow-controlplane-workloads.yaml b/patches/allow-control-plane-workloads.yaml
similarity index 100%
rename from patches/allow-controlplane-workloads.yaml
rename to patches/allow-control-plane-workloads.yaml
diff --git a/patches/vip.yaml b/patches/vip.yaml
index 78b5ff3..619e304 100644
--- a/patches/vip.yaml
+++ b/patches/vip.yaml
@@ -3,4 +3,4 @@ machine:
         interfaces:
             - interface: {{interface}}
               vip:
-                  ip: {{controlplaneIp}}
+                  ip: {{controlPlaneIp}}
diff --git a/templates/generate_configs.sh b/templates/generate_configs.sh
index 3634557..9a99ebe 100644
--- a/templates/generate_configs.sh
+++ b/templates/generate_configs.sh
@@ -5,7 +5,7 @@ CONFIGS=${ROOT}/configs
 
 # Generate the configuration for each node
 {% for node in nodes -%}
-talosctl gen config {{ node.clusterName }} https://{{ node.controlplaneIp }}:6443 -f \
+talosctl gen config {{ node.clusterName }} https://{{ node.controlPlaneIp }}:6443 -f \
 	--with-secrets ${ROOT}/secrets.yaml \
 	--talos-version {{ node.talosVersion }} \
 	--kubernetes-version {{ node.kubernesVersion }} \
@@ -15,7 +15,7 @@ talosctl gen config {{ node.clusterName }} https://{{ node.controlplaneIp }}:644
 		{# The double call to tojson is needed to properly escape the patch (object -> json -> string) -#}
 		--config-patch {{ patch|tojson|tojson }} \
 	{% endfor -%}
-	{% for patch in node.patchesControlplane -%}
+	{% for patch in node.patchesControlPlane -%}
 		--config-patch-control-plane {{ patch|tojson|tojson }} \
 	{% endfor -%}
 	--with-docs=false \
@@ -24,9 +24,9 @@ talosctl gen config {{ node.clusterName }} https://{{ node.controlplaneIp }}:644
 {% endfor %}
 
 # Generate the talosconfig file for each cluster
-{# NOTE: This assumes that each node in a cluster specifies the same controlplane IP -#}
+{# NOTE: This assumes that each node in a cluster specifies the same control plane IP -#}
 {% for cluster in clusters -%}
-talosctl gen config {{ cluster.name }} https://{{ cluster.controlplaneIp }}:6443 -f \
+talosctl gen config {{ cluster.name }} https://{{ cluster.controlPlaneIp }}:6443 -f \
 	--with-secrets ${ROOT}/secrets.yaml \
 	--output-types talosconfig \
 	-o ${CONFIGS}/{{ cluster.name }}/talosconfig
diff --git a/tools/render b/tools/render
index e7bcacd..224d911 100755
--- a/tools/render
+++ b/tools/render
@@ -135,11 +135,11 @@ def main():
         )
     )
 
-    # Get all clusterName & controlplaneIp pairs
+    # Get all clusterName & controlPlaneIp pairs
     clusters = map(
         lambda node: {
             "name": node["clusterName"],
-            "controlplaneIp": node["controlplaneIp"],
+            "controlPlaneIp": node["controlPlaneIp"],
         },
         nodes,
     )