diff --git a/incubator/zookeeper/Chart.yaml b/incubator/zookeeper/Chart.yaml
index 86c690894a..47f50b4d54 100755
--- a/incubator/zookeeper/Chart.yaml
+++ b/incubator/zookeeper/Chart.yaml
@@ -1,13 +1,14 @@
 name: zookeeper
 home: https://zookeeper.apache.org/
-version: 0.3.1
-description: Centralized service for maintaining configuration information, naming, providing distributed synchronization, and providing group services.
+version: 0.3.2
+description: Centralized service for maintaining configuration information, naming,
+  providing distributed synchronization, and providing group services.
 icon: https://zookeeper.apache.org/images/zookeeper_small.gif
 sources:
-  - https://github.com/apache/zookeeper
-  - https://github.com/kubernetes/contrib/tree/master/statefulset/zookeeper
+- https://github.com/apache/zookeeper
+- https://github.com/kubernetes/contrib/tree/master/statefulset/zookeeper
 maintainers:
-  - name: Lachlan Evenson
-    email: lachlan@deis.com
-  - name: Kenneth Owens
-    email: owensk@google.com
+- name: Lachlan Evenson
+  email: lachlan@deis.com
+- name: Kenneth Owens
+  email: owensk@google.com
diff --git a/incubator/zookeeper/templates/NOTES.txt b/incubator/zookeeper/templates/NOTES.txt
index 1581e2c3d2..10bbd749b7 100644
--- a/incubator/zookeeper/templates/NOTES.txt
+++ b/incubator/zookeeper/templates/NOTES.txt
@@ -21,6 +21,6 @@ server, you should provide multiple servers in the connection string to allow
 for the client to continue to function in the presence of individual server
 failures. It is important that you do not use IP addresses and instead use the
 DNS entries for the domain established by the StatefulSet's HeadlessService.
-Your connection string should look like {{ template "fullname" . }}-headless-0:{{ .Values.ClientPort }},{{ template "fullname" . }}-headless-1:{{ .Values.ClientPort }},...
-You can also use the client Service {{ template "fullname" . }}:{{ .Values.ClientPort }} to connect to an
+Your connection string should look like {{ template "zookeeper.fullname" . }}-headless-0:{{ .Values.ClientPort }},{{ template "zookeeper.fullname" . }}-headless-1:{{ .Values.ClientPort }},...
+You can also use the client Service {{ template "zookeeper.fullname" . }}:{{ .Values.ClientPort }} to connect to an
 available ZooKeeper server.
diff --git a/incubator/zookeeper/templates/_helpers.tpl b/incubator/zookeeper/templates/_helpers.tpl
index f0d83d2edb..a59902832f 100644
--- a/incubator/zookeeper/templates/_helpers.tpl
+++ b/incubator/zookeeper/templates/_helpers.tpl
@@ -2,7 +2,7 @@
 {{/*
 Expand the name of the chart.
 */}}
-{{- define "name" -}}
+{{- define "zookeeper.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 "zookeeper.fullname" -}}
 {{- $name := default .Chart.Name .Values.nameOverride -}}
 {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
diff --git a/incubator/zookeeper/templates/poddisruptionbudget.yaml b/incubator/zookeeper/templates/poddisruptionbudget.yaml
index 8d39ff2457..a44afd6b7d 100644
--- a/incubator/zookeeper/templates/poddisruptionbudget.yaml
+++ b/incubator/zookeeper/templates/poddisruptionbudget.yaml
@@ -2,16 +2,16 @@
 apiVersion: policy/v1beta1
 kind: PodDisruptionBudget
 metadata:
-  name: {{ template "fullname" . }}
+  name: {{ template "zookeeper.fullname" . }}
   labels:
-    app: {{ include "name" . | quote }}
+    app: {{ include "zookeeper.name" . | quote }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     release: {{ .Release.Name | quote }}
     heritage: {{ .Release.Service | quote }}
 spec:
   selector:
     matchLabels:
-      app: {{ include "name" . | quote }}
+      app: {{ include "zookeeper.name" . | quote }}
       release: {{ .Release.Name | quote }}
   {{- if .Values.MinAvailable }}
   minAvailable: {{ .Values.MinAvailable }}
diff --git a/incubator/zookeeper/templates/service-clients.yaml b/incubator/zookeeper/templates/service-clients.yaml
index 3a12f5578c..a0e871f8cd 100644
--- a/incubator/zookeeper/templates/service-clients.yaml
+++ b/incubator/zookeeper/templates/service-clients.yaml
@@ -1,9 +1,9 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ template "fullname" . }}
+  name: {{ template "zookeeper.fullname" . }}
   labels:
-    app: {{ include "name" . | quote }}
+    app: {{ include "zookeeper.name" . | quote }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     release: {{ .Release.Name | quote }}
     heritage: {{ .Release.Service | quote }}
@@ -12,5 +12,5 @@ spec:
   - port: {{ .Values.ClientPort }}
     name: client
   selector:
-    app: {{ include "name" . | quote }}
+    app: {{ include "zookeeper.name" . | quote }}
     release: {{ .Release.Name | quote }}
diff --git a/incubator/zookeeper/templates/service-headless.yaml b/incubator/zookeeper/templates/service-headless.yaml
index a1a8a09af5..eb4691d636 100644
--- a/incubator/zookeeper/templates/service-headless.yaml
+++ b/incubator/zookeeper/templates/service-headless.yaml
@@ -1,9 +1,9 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ template "fullname" . }}-headless
+  name: {{ template "zookeeper.fullname" . }}-headless
   labels:
-    app: {{ include "name" . | quote }}
+    app: {{ include "zookeeper.name" . | quote }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     release: {{ .Release.Name | quote }}
     heritage: {{ .Release.Service | quote }}
@@ -15,5 +15,5 @@ spec:
     name: leader-election
   clusterIP: None
   selector:
-    app: {{ include "name" . | quote }}
+    app: {{ include "zookeeper.name" . | quote }}
     release: {{ .Release.Name | quote }}
diff --git a/incubator/zookeeper/templates/statefulset.yaml b/incubator/zookeeper/templates/statefulset.yaml
index a3a09c7162..a2bed6a015 100644
--- a/incubator/zookeeper/templates/statefulset.yaml
+++ b/incubator/zookeeper/templates/statefulset.yaml
@@ -1,19 +1,19 @@
 apiVersion: apps/v1beta1
 kind: StatefulSet
 metadata:
-  name: {{ template "fullname" . }}
+  name: {{ template "zookeeper.fullname" . }}
   labels:
-    app: {{ include "name" . | quote }}
+    app: {{ include "zookeeper.name" . | quote }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     release: {{ .Release.Name | quote }}
     heritage: {{ .Release.Service | quote }}
 spec:
-  serviceName: {{ template "fullname" . }}-headless
+  serviceName: {{ template "zookeeper.fullname" . }}-headless
   replicas: {{ .Values.Servers }}
   template:
     metadata:
       labels:
-        app: {{ include "name" . | quote }}
+        app: {{ include "zookeeper.name" . | quote }}
         release: {{ .Release.Name | quote }}
     spec:
       {{- if eq .Values.AntiAffinity "hard" }}
@@ -23,7 +23,7 @@ spec:
             - topologyKey: "kubernetes.io/hostname"
               labelSelector:
                 matchLabels:
-                  app: {{ include "name" . | quote }}
+                  app: {{ include "zookeeper.name" . | quote }}
                   release: {{ .Release.Name | quote }}
       {{- else if eq .Values.AntiAffinity "soft" }}
       affinity:
@@ -34,7 +34,7 @@ spec:
                 topologyKey: "kubernetes.io/hostname"
                 labelSelector:
                   matchLabels:
-                    app: {{ include "name" . | quote }}
+                    app: {{ include "zookeeper.name" . | quote }}
                     release: {{ .Release.Name | quote }}
       {{- end }}
       containers: