diff --git a/templates/configMapGitConfig.yaml b/templates/configMapGitConfig.yaml
index 0714353..43d5f32 100644
--- a/templates/configMapGitConfig.yaml
+++ b/templates/configMapGitConfig.yaml
@@ -11,7 +11,7 @@ metadata:
   labels:
     {{- toYaml . | nindent 4 }}
   {{- end }}
-  name: {{ include "athens-proxy.fullname" . }}-git-config
+  name: {{ include "athens-proxy.configMap.gitConfig.name" . }}
   namespace: {{ .Release.Namespace }}
 data:
   .gitconfig: |
diff --git a/unittests/configMaps/gitConfig.yaml b/unittests/configMaps/gitConfig.yaml
index 3b92eed..73918ee 100644
--- a/unittests/configMaps/gitConfig.yaml
+++ b/unittests/configMaps/gitConfig.yaml
@@ -30,7 +30,7 @@ tests:
   - containsDocument:
       apiVersion: v1
       kind: ConfigMap
-      name: athens-proxy-unittest-git-config
+      name: athens-proxy-unittest-gitconfig
       namespace: testing
   - notExists:
       path: metadata.annotations