diff --git a/.internal-ci/helm/fog-view-fsg/templates/fog-view-fogshardrangegenerator.yaml b/.internal-ci/helm/fog-view-fsg/templates/fog-view-fsg-fogshardrangegenerator.yaml
similarity index 100%
rename from .internal-ci/helm/fog-view-fsg/templates/fog-view-fogshardrangegenerator.yaml
rename to .internal-ci/helm/fog-view-fsg/templates/fog-view-fsg-fogshardrangegenerator.yaml
diff --git a/.internal-ci/helm/fog-view-fsg/templates/fog-view-router-configmap.yaml b/.internal-ci/helm/fog-view-fsg/templates/fog-view-fsg-router-configmap.yaml
similarity index 100%
rename from .internal-ci/helm/fog-view-fsg/templates/fog-view-router-configmap.yaml
rename to .internal-ci/helm/fog-view-fsg/templates/fog-view-fsg-router-configmap.yaml
diff --git a/.internal-ci/helm/fog-view-fsg/templates/fog-view-router-headless-service.yaml b/.internal-ci/helm/fog-view-fsg/templates/fog-view-fsg-router-headless-service.yaml
similarity index 100%
rename from .internal-ci/helm/fog-view-fsg/templates/fog-view-router-headless-service.yaml
rename to .internal-ci/helm/fog-view-fsg/templates/fog-view-fsg-router-headless-service.yaml
diff --git a/.internal-ci/helm/fog-view-fsg/templates/fog-view-store-configmap.yaml b/.internal-ci/helm/fog-view-fsg/templates/fog-view-fsg-store-configmap.yaml
similarity index 100%
rename from .internal-ci/helm/fog-view-fsg/templates/fog-view-store-configmap.yaml
rename to .internal-ci/helm/fog-view-fsg/templates/fog-view-fsg-store-configmap.yaml
diff --git a/.internal-ci/helm/fog-view-fsg/templates/fog-view-store-service.yaml b/.internal-ci/helm/fog-view-fsg/templates/fog-view-fsg-store-service.yaml
similarity index 100%
rename from .internal-ci/helm/fog-view-fsg/templates/fog-view-store-service.yaml
rename to .internal-ci/helm/fog-view-fsg/templates/fog-view-fsg-store-service.yaml
diff --git a/.internal-ci/helm/fog-view-fsg/templates/fog-view-store-servicemonitor.yaml b/.internal-ci/helm/fog-view-fsg/templates/fog-view-fsg-store-servicemonitor.yaml
similarity index 100%
rename from .internal-ci/helm/fog-view-fsg/templates/fog-view-store-servicemonitor.yaml
rename to .internal-ci/helm/fog-view-fsg/templates/fog-view-fsg-store-servicemonitor.yaml
diff --git a/.internal-ci/helm/fog-view-service/templates/router-grpc-ingress.yaml b/.internal-ci/helm/fog-view-service/templates/fog-view-service-router-grpc-ingress.yaml
similarity index 91%
rename from .internal-ci/helm/fog-view-service/templates/router-grpc-ingress.yaml
rename to .internal-ci/helm/fog-view-service/templates/fog-view-service-router-grpc-ingress.yaml
index b9b3fe1c7e..6c423f44b5 100644
--- a/.internal-ci/helm/fog-view-service/templates/router-grpc-ingress.yaml
+++ b/.internal-ci/helm/fog-view-service/templates/fog-view-service-router-grpc-ingress.yaml
@@ -1,6 +1,6 @@
 # Copyright (c) 2018-2023 The MobileCoin Foundation
 {{- if .Values.fogView.router.ingress.enabled }}
-{{- $responderId := .Values.responderID | required "fogView.responderID is required." }}
+{{- $responderId := .Values.fogView.responderID | required "fogView.responderID is required." }}
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
diff --git a/.internal-ci/helm/fog-view-service/templates/router-http-ingress.yaml b/.internal-ci/helm/fog-view-service/templates/fog-view-service-router-http-ingress.yaml
similarity index 91%
rename from .internal-ci/helm/fog-view-service/templates/router-http-ingress.yaml
rename to .internal-ci/helm/fog-view-service/templates/fog-view-service-router-http-ingress.yaml
index e6f9e21346..f60f89c080 100644
--- a/.internal-ci/helm/fog-view-service/templates/router-http-ingress.yaml
+++ b/.internal-ci/helm/fog-view-service/templates/fog-view-service-router-http-ingress.yaml
@@ -1,6 +1,6 @@
 # Copyright (c) 2018-2023 The MobileCoin Foundation
 {{- if .Values.fogView.router.ingress.enabled }}
-{{- $responderId := .Values.responderID | required "fogView.responderID is required." }}
+{{- $responderId := .Values.fogView.responderID | required "fogView.responderID is required." }}
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
diff --git a/.internal-ci/helm/fog-view-service/templates/router-service.yaml b/.internal-ci/helm/fog-view-service/templates/fog-view-service-router-service.yaml
similarity index 100%
rename from .internal-ci/helm/fog-view-service/templates/router-service.yaml
rename to .internal-ci/helm/fog-view-service/templates/fog-view-service-router-service.yaml
diff --git a/.internal-ci/helm/fog-view-service/templates/router-servicemonitor.yaml b/.internal-ci/helm/fog-view-service/templates/fog-view-service-router-servicemonitor.yaml
similarity index 100%
rename from .internal-ci/helm/fog-view-service/templates/router-servicemonitor.yaml
rename to .internal-ci/helm/fog-view-service/templates/fog-view-service-router-servicemonitor.yaml
diff --git a/.internal-ci/helm/fog-view-service/templates/tls-certificate.yaml b/.internal-ci/helm/fog-view-service/templates/fog-view-service-tls-certificate.yaml
similarity index 100%
rename from .internal-ci/helm/fog-view-service/templates/tls-certificate.yaml
rename to .internal-ci/helm/fog-view-service/templates/fog-view-service-tls-certificate.yaml