diff --git a/stable/mailhog/Chart.yaml b/stable/mailhog/Chart.yaml
index 894a416480..16ece95217 100644
--- a/stable/mailhog/Chart.yaml
+++ b/stable/mailhog/Chart.yaml
@@ -2,18 +2,18 @@ apiVersion: v1
 description: An e-mail testing tool for developers
 name: mailhog
 appVersion: 1.0.0
-version: 1.2.0
+version: 2.0.0
 keywords:
-  - mailhog
-  - mail
-  - smtp
-  - email
-  - e-mail
-  - testing
+- mailhog
+- mail
+- smtp
+- email
+- e-mail
+- testing
 home: http://iankent.uk/project/mailhog/
 icon: https://raw.githubusercontent.com/mailhog/MailHog-UI/master/assets/images/hog.png
 sources:
-  - https://github.com/mailhog/MailHog
+- https://github.com/mailhog/MailHog
 maintainers:
-  - name: unguiculus
-    email: unguiculus@gmail.com
+- name: unguiculus
+  email: unguiculus@gmail.com
diff --git a/stable/mailhog/templates/NOTES.txt b/stable/mailhog/templates/NOTES.txt
index cca08780fb..74f8f8ffe2 100644
--- a/stable/mailhog/templates/NOTES.txt
+++ b/stable/mailhog/templates/NOTES.txt
@@ -1,16 +1,16 @@
 Mailhog can be accessed via ports {{ .Values.service.port.http }} (HTTP) and {{ .Values.service.port.smtp }} (SMTP) on the following DNS name from within your cluster:
-{{ template "fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local
+{{ template "mailhog.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local
 
 If you'd like to test your instance, forward the ports locally:
 
 Web UI:
 =======
 
-export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "mailhog.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
 kubectl port-forward --namespace {{ .Release.Namespace }} $POD_NAME 8025
 
 SMTP Server:
 ============
 
-export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "mailhog.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
 kubectl port-forward --namespace {{ .Release.Namespace }} $POD_NAME 1025
diff --git a/stable/mailhog/templates/_helpers.tpl b/stable/mailhog/templates/_helpers.tpl
index af0f14c9a0..9e5efa94e6 100644
--- a/stable/mailhog/templates/_helpers.tpl
+++ b/stable/mailhog/templates/_helpers.tpl
@@ -2,7 +2,7 @@
 {{/*
 Expand the name of the chart.
 */}}
-{{- define "name" -}}
+{{- define "mailhog.name" -}}
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
@@ -10,7 +10,7 @@ Expand the name of the chart.
 Create a default fully qualified app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 */}}
-{{- define "fullname" -}}
+{{- define "mailhog.fullname" -}}
 {{- $name := default .Chart.Name .Values.nameOverride -}}
 {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
@@ -18,21 +18,21 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 {{/*
 Create the name for the auth secret.
 */}}
-{{- define "authFileSecret" -}}
+{{- define "mailhog.authFileSecret" -}}
     {{- if .Values.auth.existingKeySecret -}}
         {{- .Values.auth.existingKeySecret -}}
     {{- else -}}
-        {{- template "fullname" . -}}-auth
+        {{- template "mailhog.fullname" . -}}-auth
     {{- end -}}
 {{- end -}}
 
 {{/*
 Create the name for the tls secret.
 */}}
-{{- define "tlsSecret" -}}
+{{- define "mailhog.tlsSecret" -}}
     {{- if .Values.ingress.tls.existingSecret -}}
         {{- .Values.ingress.tls.existingSecret -}}
     {{- else -}}
-        {{- template "fullname" . -}}-tls
+        {{- template "mailhog.fullname" . -}}-tls
     {{- end -}}
 {{- end -}}
diff --git a/stable/mailhog/templates/auth-secret.yaml b/stable/mailhog/templates/auth-secret.yaml
index c90a2c0328..83471ac580 100644
--- a/stable/mailhog/templates/auth-secret.yaml
+++ b/stable/mailhog/templates/auth-secret.yaml
@@ -3,11 +3,11 @@ apiVersion: v1
 kind: Secret
 metadata:
   labels:
-    app: {{ template "name" . }}
+    app: {{ template "mailhog.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version }}
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}
-  name: {{ template "authFileSecret" . }}
+  name: {{ template "mailhog.authFileSecret" . }}
 type: Opaque
 data:
   {{ .Values.auth.fileName }}: {{ .Values.auth.fileContents | b64enc }}
diff --git a/stable/mailhog/templates/deployment.yaml b/stable/mailhog/templates/deployment.yaml
index bd7174d11d..b6a03661d9 100644
--- a/stable/mailhog/templates/deployment.yaml
+++ b/stable/mailhog/templates/deployment.yaml
@@ -2,11 +2,11 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   labels:
-    app: {{ template "name" . }}
+    app: {{ template "mailhog.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version }}
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}
-  name: {{ template "fullname" . }}
+  name: {{ template "mailhog.fullname" . }}
 spec:
   template:
     metadata:
@@ -15,11 +15,11 @@ spec:
 {{ toYaml .Values.podAnnotations | indent 8 }}
     {{- end }}
       labels:
-        app: {{ template "name" . }}
+        app: {{ template "mailhog.name" . }}
         release: {{ .Release.Name }}
     spec:
       containers:
-        - name: {{ template "name" . }}
+        - name: {{ template "mailhog.name" . }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
           imagePullPolicy: "{{ .Values.image.pullPolicy }}"
           env:
@@ -66,5 +66,5 @@ spec:
       volumes:
         - name: authdir
           secret:
-            secretName: {{ template "authFileSecret" . }}
+            secretName: {{ template "mailhog.authFileSecret" . }}
     {{- end }}
diff --git a/stable/mailhog/templates/ingress.yaml b/stable/mailhog/templates/ingress.yaml
index 0d1b33f9fd..a3f89c3055 100644
--- a/stable/mailhog/templates/ingress.yaml
+++ b/stable/mailhog/templates/ingress.yaml
@@ -1,5 +1,5 @@
 {{- if .Values.ingress.enabled }}
-{{- $fullName := include "fullname" . -}}
+{{- $fullName := include "mailhog.fullname" . -}}
 {{- $path := .Values.ingress.path -}}
 apiVersion: extensions/v1beta1
 kind: Ingress
@@ -9,7 +9,7 @@ metadata:
 {{ toYaml .Values.ingress.annotations | indent 4 }}
 {{- end }}
   labels:
-    app: {{ template "name" . }}
+    app: {{ template "mailhog.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version }}
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}
@@ -21,7 +21,7 @@ spec:
       {{- range .Values.ingress.hosts }}
         - {{ . }}
       {{- end }}
-      secretName: {{ template "tlsSecret" . }}
+      secretName: {{ template "mailhog.tlsSecret" . }}
 {{- end }}
   rules:
   {{- range .Values.ingress.hosts }}
diff --git a/stable/mailhog/templates/service.yaml b/stable/mailhog/templates/service.yaml
index 33d49c4a1e..e377793e1d 100644
--- a/stable/mailhog/templates/service.yaml
+++ b/stable/mailhog/templates/service.yaml
@@ -6,11 +6,11 @@ metadata:
 {{ toYaml .Values.service.annotations | indent 4 }}
 {{- end }}
   labels:
-    app: {{ template "name" . }}
+    app: {{ template "mailhog.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version }}
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}
-  name: {{ template "fullname" . }}
+  name: {{ template "mailhog.fullname" . }}
 spec:
   type: "{{ .Values.service.type }}"
   clusterIP: "{{ .Values.service.clusterIP }}"
@@ -41,5 +41,5 @@ spec:
       nodePort: {{ .Values.service.nodePort.smtp }}
       {{- end }}
   selector:
-    app: {{ template "name" . }}
+    app: {{ template "mailhog.name" . }}
     release: {{ .Release.Name }}
diff --git a/stable/mailhog/templates/tls-secret.yaml b/stable/mailhog/templates/tls-secret.yaml
index 76793609c7..990664150c 100644
--- a/stable/mailhog/templates/tls-secret.yaml
+++ b/stable/mailhog/templates/tls-secret.yaml
@@ -7,11 +7,11 @@ metadata:
 {{ toYaml .Values.ingress.tls.secretAnnotations | indent 4 }}
 {{- end }}
   labels:
-    app: {{ template "name" . }}
+    app: {{ template "mailhog.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version }}
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}
-  name: {{ template "tlsSecret" . }}
+  name: {{ template "mailhog.tlsSecret" . }}
 type: Opaque
 data:
 {{ toYaml .Values.ingress.tls.secretContents | indent 2 }}