diff --git a/helm-charts/chatqna/templates/customMetrics.yaml b/helm-charts/chatqna/templates/custom-metrics-configmap.yaml
similarity index 100%
rename from helm-charts/chatqna/templates/customMetrics.yaml
rename to helm-charts/chatqna/templates/custom-metrics-configmap.yaml
diff --git a/helm-charts/common/tei/templates/horizontalPodAutoscaler.yaml b/helm-charts/common/tei/templates/horizontal-pod-autoscaler.yaml
similarity index 100%
rename from helm-charts/common/tei/templates/horizontalPodAutoscaler.yaml
rename to helm-charts/common/tei/templates/horizontal-pod-autoscaler.yaml
diff --git a/helm-charts/common/teirerank/templates/horizontalPodAutoscaler.yaml b/helm-charts/common/teirerank/templates/horizontal-pod-autoscaler.yaml
similarity index 100%
rename from helm-charts/common/teirerank/templates/horizontalPodAutoscaler.yaml
rename to helm-charts/common/teirerank/templates/horizontal-pod-autoscaler.yaml
diff --git a/helm-charts/common/tgi/templates/horizontalPorAutoscaler.yaml b/helm-charts/common/tgi/templates/horizontal-pod-autoscaler.yaml
similarity index 100%
rename from helm-charts/common/tgi/templates/horizontalPorAutoscaler.yaml
rename to helm-charts/common/tgi/templates/horizontal-pod-autoscaler.yaml