diff --git a/stable/kube2iam/Chart.yaml b/stable/kube2iam/Chart.yaml
index db7f2c9713..088468e09d 100644
--- a/stable/kube2iam/Chart.yaml
+++ b/stable/kube2iam/Chart.yaml
@@ -1,18 +1,18 @@
 name: kube2iam
-version: 0.5.4
+version: 0.6.0
 description: Provide IAM credentials to pods based on annotations.
 keywords:
-  - kube2iam
-  - aws
-  - iam
-  - security
+- kube2iam
+- aws
+- iam
+- security
 sources:
-  - https://github.com/jtblin/kube2iam
+- https://github.com/jtblin/kube2iam
 maintainers:
-  - name: Josh Carp
-    email: jm.carp@gmail.com
-  - name: Michael Haselton
-    email: michael.haselton@gmail.com
-  - name: Michael Goodness
-    email: mgoodness@gmail.com
+- name: Josh Carp
+  email: jm.carp@gmail.com
+- name: Michael Haselton
+  email: michael.haselton@gmail.com
+- name: Michael Goodness
+  email: mgoodness@gmail.com
 engine: gotpl
diff --git a/stable/kube2iam/templates/NOTES.txt b/stable/kube2iam/templates/NOTES.txt
index 095f9da2c6..d55939f9ad 100644
--- a/stable/kube2iam/templates/NOTES.txt
+++ b/stable/kube2iam/templates/NOTES.txt
@@ -1,6 +1,6 @@
 To verify that kube2iam has started, run:
 
-  kubectl --namespace={{ .Release.Namespace }} get pods -l "app={{ template "name" . }},release={{ .Release.Name }}"
+  kubectl --namespace={{ .Release.Namespace }} get pods -l "app={{ template "kube2iam.name" . }},release={{ .Release.Name }}"
 
 Add an iam.amazonaws.com/role annotation to your pods with the role you want them to assume.
 
diff --git a/stable/kube2iam/templates/_helpers.tpl b/stable/kube2iam/templates/_helpers.tpl
index 59d6e989d3..42a2e6aaec 100644
--- a/stable/kube2iam/templates/_helpers.tpl
+++ b/stable/kube2iam/templates/_helpers.tpl
@@ -2,7 +2,7 @@
 {{/*
 Expand the name of the chart.
 */}}
-{{- define "name" -}}
+{{- define "kube2iam.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 "kube2iam.fullname" -}}
 {{- $name := default .Chart.Name .Values.nameOverride -}}
 {{- if ne $name .Release.Name -}}
 {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
diff --git a/stable/kube2iam/templates/clusterrole.yaml b/stable/kube2iam/templates/clusterrole.yaml
index 95ba8206d7..6a4ce25224 100644
--- a/stable/kube2iam/templates/clusterrole.yaml
+++ b/stable/kube2iam/templates/clusterrole.yaml
@@ -3,11 +3,11 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: ClusterRole
 metadata:
   labels:
-    app: {{ template "name" . }}
+    app: {{ template "kube2iam.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version }}
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}
-  name: {{ template "fullname" . }}
+  name: {{ template "kube2iam.fullname" . }}
 rules:
   - apiGroups:
       - ""
diff --git a/stable/kube2iam/templates/clusterrolebinding.yaml b/stable/kube2iam/templates/clusterrolebinding.yaml
index 5a48ca212f..be986d4870 100644
--- a/stable/kube2iam/templates/clusterrolebinding.yaml
+++ b/stable/kube2iam/templates/clusterrolebinding.yaml
@@ -3,17 +3,17 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: ClusterRoleBinding
 metadata:
   labels:
-    app: {{ template "name" . }}
+    app: {{ template "kube2iam.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version }}
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}
-  name: {{ template "fullname" . }}
+  name: {{ template "kube2iam.fullname" . }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: {{ template "fullname" . }}
+  name: {{ template "kube2iam.fullname" . }}
 subjects:
   - kind: ServiceAccount
-    name: {{ template "fullname" . }}
+    name: {{ template "kube2iam.fullname" . }}
     namespace: {{ .Release.Namespace }}
 {{- end -}}
diff --git a/stable/kube2iam/templates/daemonset.yaml b/stable/kube2iam/templates/daemonset.yaml
index 5b6ad586b7..214fbbd7b5 100644
--- a/stable/kube2iam/templates/daemonset.yaml
+++ b/stable/kube2iam/templates/daemonset.yaml
@@ -2,11 +2,11 @@ apiVersion: extensions/v1beta1
 kind: DaemonSet
 metadata:
   labels:
-    app: {{ template "name" . }}
+    app: {{ template "kube2iam.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version }}
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}
-  name: {{ template "fullname" . }}
+  name: {{ template "kube2iam.fullname" . }}
 spec:
   template:
     metadata:
@@ -15,7 +15,7 @@ spec:
 {{ toYaml .Values.podAnnotations | indent 8 }}
     {{- end }}
       labels:
-        app: {{ template "name" . }}
+        app: {{ template "kube2iam.name" . }}
         release: {{ .Release.Name }}
       {{- if .Values.podLabels }}
 {{ toYaml .Values.podLabels | indent 8 }}
@@ -55,7 +55,7 @@ spec:
       nodeSelector:
 {{ toYaml .Values.nodeSelector | indent 8 }}
     {{- end }}
-      serviceAccountName: {{ if .Values.rbac.create }}{{ template "fullname" . }}{{ else }}"{{ .Values.rbac.serviceAccountName }}"{{ end }}
+      serviceAccountName: {{ if .Values.rbac.create }}{{ template "kube2iam.fullname" . }}{{ else }}"{{ .Values.rbac.serviceAccountName }}"{{ end }}
       tolerations:
 {{ toYaml .Values.tolerations | indent 8 }}
 {{- if and (eq .Capabilities.KubeVersion.Major "1") (gt .Capabilities.KubeVersion.Minor "5") }}
diff --git a/stable/kube2iam/templates/serviceaccount.yaml b/stable/kube2iam/templates/serviceaccount.yaml
index 8967eb1a75..1920914202 100644
--- a/stable/kube2iam/templates/serviceaccount.yaml
+++ b/stable/kube2iam/templates/serviceaccount.yaml
@@ -3,9 +3,9 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   labels:
-    app: {{ template "name" . }}
+    app: {{ template "kube2iam.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version }}
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}
-  name: {{ template "fullname" . }}
+  name: {{ template "kube2iam.fullname" . }}
 {{- end -}}