diff --git a/charts/cluster-addons/templates/_helpers.tpl b/charts/cluster-addons/templates/_helpers.tpl
index c5bc271..27d7bb4 100644
--- a/charts/cluster-addons/templates/_helpers.tpl
+++ b/charts/cluster-addons/templates/_helpers.tpl
@@ -115,14 +115,14 @@ Determines if an addon is enabled given the name.
 {{- and $ctx.Values.openstack.enabled $ctx.Values.openstack.csiCinder.enabled | toYaml -}}
 {{- else if eq $name "ingress-nginx" -}}
 {{- and $ctx.Values.ingress.enabled $ctx.Values.ingress.nginx.enabled | toYaml -}}
-{{- else if eq $name "dashboard" -}}
-{{- $ctx.Values.dashboard.enabled | toYaml -}}
+{{- else if eq $name "kubernetes-dashboard" -}}
+{{- $ctx.Values.kubernetesDashboard.enabled | toYaml -}}
 {{- else if eq $name "metrics-server" -}}
 {{- $ctx.Values.metricsServer.enabled | toYaml -}}
 {{- else if eq $name "monitoring" -}}
 {{- $ctx.Values.monitoring.enabled | toYaml -}}
-{{- else if eq $name "nfd" -}}
-{{- $ctx.Values.nfd.enabled | toYaml -}}
+{{- else if eq $name "node-feature-discovery" -}}
+{{- $ctx.Values.nodeFeatureDiscovery.enabled | toYaml -}}
 {{- else if eq $name "nvidia-gpu-operator" -}}
 {{- $ctx.Values.nvidiaGPUOperator.enabled | toYaml -}}
 {{- else if hasKey $ctx.Values.extraAddons $name -}}
@@ -147,7 +147,7 @@ value:
   - storage
   - ingress
   {{- else if eq $name "nvidia-gpu-operator" }}
-  - nfd
+  - node-feature-discovery
   {{- else if hasKey $ctx.Values.extraAddons $name }}
   {{- dig $name "dependsOn" list $ctx.Values.extraAddons | toYaml | nindent 2 }}
   {{- else }}
diff --git a/charts/cluster-addons/templates/dashboard.yaml b/charts/cluster-addons/templates/dashboard.yaml
index 2b1c9e6..7ac05c8 100644
--- a/charts/cluster-addons/templates/dashboard.yaml
+++ b/charts/cluster-addons/templates/dashboard.yaml
@@ -1,13 +1,13 @@
-{{- define "cluster-addons.dashboard.config" -}}
-{{- include "cluster-addons.job.defaults" (list . "dashboard") }}
+{{- define "cluster-addons.kubernetes-dashboard.config" -}}
+{{- include "cluster-addons.job.defaults" (list . "kubernetes-dashboard") }}
 installType: helm
-helm: {{ omit .Values.dashboard "enabled" | toYaml | nindent 2 }}
+helm: {{ omit .Values.kubernetesDashboard "enabled" | toYaml | nindent 2 }}
 {{- end }}
 
 {{-
   include "addon.job" (list
     .
-    "dashboard"
-    "cluster-addons.dashboard.config"
+    "kubernetes-dashboard"
+    "cluster-addons.kubernetes-dashboard.config"
   )
 }}
diff --git a/charts/cluster-addons/templates/nfd.yaml b/charts/cluster-addons/templates/nfd.yaml
index 931b93c..f7b963e 100644
--- a/charts/cluster-addons/templates/nfd.yaml
+++ b/charts/cluster-addons/templates/nfd.yaml
@@ -1,13 +1,13 @@
-{{- define "cluster-addons.nfd.config" -}}
-{{- include "cluster-addons.job.defaults" (list . "nfd") }}
+{{- define "cluster-addons.node-feature-discovery.config" -}}
+{{- include "cluster-addons.job.defaults" (list . "node-feature-discovery") }}
 installType: helm
-helm: {{ omit .Values.nfd "enabled" | toYaml | nindent 2 }}
+helm: {{ omit .Values.nodeFeatureDiscovery "enabled" | toYaml | nindent 2 }}
 {{- end }}
 
 {{-
   include "addon.job" (list
     .
-    "nfd"
-    "cluster-addons.nfd.config"
+    "node-feature-discovery"
+    "cluster-addons.node-feature-discovery.config"
   )
 }}
diff --git a/charts/cluster-addons/values.yaml b/charts/cluster-addons/values.yaml
index aebc265..593b6a6 100644
--- a/charts/cluster-addons/values.yaml
+++ b/charts/cluster-addons/values.yaml
@@ -192,7 +192,7 @@ metricsServer:
           name: metrics-server
 
 # Settings for the Kubernetes dashboard
-dashboard:
+kubernetesDashboard:
   # Indicates if the Kubernetes dashboard should be enabled
   enabled: false
   chart:
@@ -265,8 +265,8 @@ monitoring:
     namespace: monitoring-system
     values: {}
 
-# Settings for node feature discovery (NFD)
-nfd:
+# Settings for node feature discovery
+nodeFeatureDiscovery:
   # Indicates if node feature discovery should be enabled
   enabled: true
   chart: