diff --git a/stable/heapster/Chart.yaml b/stable/heapster/Chart.yaml
index 596dc3942905..60b3e38251e4 100644
--- a/stable/heapster/Chart.yaml
+++ b/stable/heapster/Chart.yaml
@@ -1,14 +1,14 @@
 apiVersion: v1
 description: Heapster enables Container Cluster Monitoring and Performance Analysis.
 name: heapster
-version: 0.1.2
+version: 0.2.0
 sources:
-  - https://github.com/kubernetes/heapster
-  - https://github.com/kubernetes/contrib/tree/master/addon-resizer
+- https://github.com/kubernetes/heapster
+- https://github.com/kubernetes/contrib/tree/master/addon-resizer
 keywords:
-  - metrics
-  - cadvisor
-  - monitoring
+- metrics
+- cadvisor
+- monitoring
 maintainers:
 - name: Jose Aguirre
   email: jose.g.aguirre@intel.com
diff --git a/stable/heapster/templates/NOTES.txt b/stable/heapster/templates/NOTES.txt
index cbb09e581b48..03e66e0ef34e 100644
--- a/stable/heapster/templates/NOTES.txt
+++ b/stable/heapster/templates/NOTES.txt
@@ -1,14 +1,14 @@
 1. Get the application URL by running these commands:
 {{- if contains "NodePort" .Values.service.type }}
-  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "service.fullname" . }})
+  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "heapster.service.fullname" . }})
   export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
   echo http://$NODE_IP:$NODE_PORT/
 {{- else if contains "LoadBalancer" .Values.service.type }}
      NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-           You can watch the status of by running 'kubectl get svc -w {{ template "service.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "service.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
+           You can watch the status of by running 'kubectl get svc -w {{ template "heapster.service.fullname" . }}'
+  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "heapster.service.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
   echo http://$SERVICE_IP:{{ .Values.service.externalPort }}
 {{- else if contains "ClusterIP"  .Values.service.type }}
-  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "service.fullname" . }}" -o jsonpath="{.items[0].metadata.name}")
+  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "heapster.service.fullname" . }}" -o jsonpath="{.items[0].metadata.name}")
   kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME {{ .Values.service.externalPort }}
 {{- end }}
diff --git a/stable/heapster/templates/_helpers.tpl b/stable/heapster/templates/_helpers.tpl
index a75a8d5268ca..da7d0f074c40 100644
--- a/stable/heapster/templates/_helpers.tpl
+++ b/stable/heapster/templates/_helpers.tpl
@@ -2,7 +2,7 @@
 {{/*
 Expand the name of the chart.
 */}}
-{{- define "name" -}}
+{{- define "heapster.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 "heapster.fullname" -}}
 {{- $name := default .Chart.Name .Values.nameOverride -}}
 {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
@@ -19,6 +19,6 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 Create a service name that defaults to app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 */}}
-{{- define "service.fullname" -}}
+{{- define "heapster.service.fullname" -}}
 {{- .Values.service.nameOverride | default .Chart.Name }}
 {{- end -}}
diff --git a/stable/heapster/templates/deployment.yaml b/stable/heapster/templates/deployment.yaml
index 359ac348424a..6f47eef9d2b8 100644
--- a/stable/heapster/templates/deployment.yaml
+++ b/stable/heapster/templates/deployment.yaml
@@ -1,7 +1,7 @@
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: {{ template "fullname" . }}
+  name: {{ template "heapster.fullname" . }}
   labels:
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     {{- range $key, $value := .Values.labels }}
@@ -12,9 +12,9 @@ spec:
   template:
     metadata:
       labels:
-        app: {{ template "fullname" . }}
+        app: {{ template "heapster.fullname" . }}
     spec:
-      serviceAccountName: {{ if .Values.rbac.create }}{{ template "fullname" . }}{{ else }}"{{ .Values.rbac.serviceAccountName }}"{{ end }}
+      serviceAccountName: {{ if .Values.rbac.create }}{{ template "heapster.fullname" . }}{{ else }}"{{ .Values.rbac.serviceAccountName }}"{{ end }}
       nodeSelector:
 {{ toYaml .Values.nodeSelector | indent 8 }}
       containers:
@@ -58,7 +58,7 @@ spec:
         {{- end }}
         command:
           - "/pod_nanny"
-          - "--deployment={{ template "fullname" . }}"
+          - "--deployment={{ template "heapster.fullname" . }}"
           - "--container={{ .Chart.Name }}"
           {{- range .Values.resizer.flags }}
           - {{ . | quote }}
diff --git a/stable/heapster/templates/heapster-crb.yaml b/stable/heapster/templates/heapster-crb.yaml
index ffeed4a7a7d4..508375805ae8 100644
--- a/stable/heapster/templates/heapster-crb.yaml
+++ b/stable/heapster/templates/heapster-crb.yaml
@@ -3,17 +3,17 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: ClusterRoleBinding
 metadata:
   labels:
-    app: {{ template "name" . }}
+    app: {{ template "heapster.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version }}
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}
-  name: {{ template "fullname" . }}
+  name: {{ template "heapster.fullname" . }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
   name: system:heapster
 subjects:
   - kind: ServiceAccount
-    name: {{ template "fullname" . }}
+    name: {{ template "heapster.fullname" . }}
     namespace: {{ .Release.Namespace }}
 {{- end -}}
diff --git a/stable/heapster/templates/pod-nanny-role.yaml b/stable/heapster/templates/pod-nanny-role.yaml
index df2fe8b1e6f0..a4bca2357b79 100644
--- a/stable/heapster/templates/pod-nanny-role.yaml
+++ b/stable/heapster/templates/pod-nanny-role.yaml
@@ -3,9 +3,9 @@
 apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: Role
 metadata:
-  name: {{ template "fullname" . }}-pod-nanny
+  name: {{ template "heapster.fullname" . }}-pod-nanny
   labels:
-    app: {{ template "name" . }}
+    app: {{ template "heapster.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version }}
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}
diff --git a/stable/heapster/templates/pod-nanny-rolebinding.yaml b/stable/heapster/templates/pod-nanny-rolebinding.yaml
index bf7cfb2a6f92..f36717469781 100644
--- a/stable/heapster/templates/pod-nanny-rolebinding.yaml
+++ b/stable/heapster/templates/pod-nanny-rolebinding.yaml
@@ -3,19 +3,19 @@
 apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: RoleBinding
 metadata:
-  name: {{ template "fullname" . }}-pod-nanny
+  name: {{ template "heapster.fullname" . }}-pod-nanny
   labels:
-    app: {{ template "name" . }}
+    app: {{ template "heapster.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version }}
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
-  name: {{ template "fullname" . }}-pod-nanny
+  name: {{ template "heapster.fullname" . }}-pod-nanny
 subjects:
 - kind: ServiceAccount
-  name: {{ template "fullname" . }}
+  name: {{ template "heapster.fullname" . }}
   namespace: {{ .Release.Namespace }}
 {{- end -}}
 {{- end -}}
diff --git a/stable/heapster/templates/service.yaml b/stable/heapster/templates/service.yaml
index 693094dc3c1f..5dbba5daf95d 100644
--- a/stable/heapster/templates/service.yaml
+++ b/stable/heapster/templates/service.yaml
@@ -1,10 +1,10 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ template "service.fullname" . }}
+  name: {{ template "heapster.service.fullname" . }}
   labels:
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    app: {{ template "fullname" . }}
+    app: {{ template "heapster.fullname" . }}
     heritage: "{{ .Release.Service }}"
     release: "{{ .Release.Name }}"
     {{- range $key, $value := .Values.service.labels }}
@@ -17,4 +17,4 @@ spec:
     targetPort: {{ .Values.service.internalPort }}
     protocol: TCP
   selector:
-    app: {{ template "fullname" . }}
+    app: {{ template "heapster.fullname" . }}
diff --git a/stable/heapster/templates/serviceaccount.yaml b/stable/heapster/templates/serviceaccount.yaml
index 8967eb1a75d8..e4e399aa98dd 100644
--- a/stable/heapster/templates/serviceaccount.yaml
+++ b/stable/heapster/templates/serviceaccount.yaml
@@ -3,9 +3,9 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   labels:
-    app: {{ template "name" . }}
+    app: {{ template "heapster.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version }}
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}
-  name: {{ template "fullname" . }}
+  name: {{ template "heapster.fullname" . }}
 {{- end -}}