diff --git a/incubator/kafka/Chart.yaml b/incubator/kafka/Chart.yaml
index 0f4d961a21cb..839297b59915 100755
--- a/incubator/kafka/Chart.yaml
+++ b/incubator/kafka/Chart.yaml
@@ -1,19 +1,20 @@
 apiVersion: v1
-description: Apache Kafka is publish-subscribe messaging rethought as a distributed commit log.
+description: Apache Kafka is publish-subscribe messaging rethought as a distributed
+  commit log.
 name: kafka
-version: 0.1.4
+version: 0.1.5
 keywords:
-  - kafka
-  - zookeeper
-  - kafka statefulset
+- kafka
+- zookeeper
+- kafka statefulset
 home: https://kafka.apache.org/
 sources:
-  - https://github.com/kubernetes/charts/tree/master/incubator/zookeeper
-  - https://github.com/Yolean/kubernetes-kafka
-  - https://github.com/solsson/dockerfiles/tree/master/kafka
+- https://github.com/kubernetes/charts/tree/master/incubator/zookeeper
+- https://github.com/Yolean/kubernetes-kafka
+- https://github.com/solsson/dockerfiles/tree/master/kafka
 maintainers:
-  - name: Faraaz Khan
-    email: faraaz@rationalizeit.us
-  - name: Marc Villacorta
-    email: marc.villacorta@gmail.com
+- name: Faraaz Khan
+  email: faraaz@rationalizeit.us
+- name: Marc Villacorta
+  email: marc.villacorta@gmail.com
 icon: https://kafka.apache.org/images/logo.png
diff --git a/incubator/kafka/templates/_helpers.tpl b/incubator/kafka/templates/_helpers.tpl
index f0d83d2edba6..ae571fc4aee1 100644
--- a/incubator/kafka/templates/_helpers.tpl
+++ b/incubator/kafka/templates/_helpers.tpl
@@ -2,7 +2,7 @@
 {{/*
 Expand the name of the chart.
 */}}
-{{- define "name" -}}
+{{- define "kafka.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 "kafka.fullname" -}}
 {{- $name := default .Chart.Name .Values.nameOverride -}}
 {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
diff --git a/incubator/kafka/templates/service-brokers.yaml b/incubator/kafka/templates/service-brokers.yaml
index 90a8ee82b29a..6d1928bfffac 100644
--- a/incubator/kafka/templates/service-brokers.yaml
+++ b/incubator/kafka/templates/service-brokers.yaml
@@ -1,9 +1,9 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ template "fullname" . }}
+  name: {{ template "kafka.fullname" . }}
   labels:
-    app: {{ include "name" . | quote }}
+    app: {{ include "kafka.name" . | quote }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     release: {{ .Release.Name | quote }}
     heritage: {{ .Release.Service | quote }}
@@ -12,5 +12,5 @@ spec:
   - name: broker
     port: 9092
   selector:
-    app: {{ include "name" . | quote }}
+    app: {{ include "kafka.name" . | quote }}
     release: {{ .Release.Name | quote }}
diff --git a/incubator/kafka/templates/service-headless.yaml b/incubator/kafka/templates/service-headless.yaml
index a25df9c41658..3cf37d4c7a22 100644
--- a/incubator/kafka/templates/service-headless.yaml
+++ b/incubator/kafka/templates/service-headless.yaml
@@ -1,9 +1,9 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ template "fullname" . }}-headless
+  name: {{ template "kafka.fullname" . }}-headless
   labels:
-    app: {{ include "name" . | quote }}
+    app: {{ include "kafka.name" . | quote }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     release: {{ .Release.Name | quote }}
     heritage: {{ .Release.Service | quote }}
@@ -15,5 +15,5 @@ spec:
     port: 9092
   clusterIP: None
   selector:
-    app: {{ include "name" . | quote }}
+    app: {{ include "kafka.name" . | quote }}
     release: {{ .Release.Name | quote }}
diff --git a/incubator/kafka/templates/statefulset.yaml b/incubator/kafka/templates/statefulset.yaml
index 9a405e94cccc..ce219966cea6 100644
--- a/incubator/kafka/templates/statefulset.yaml
+++ b/incubator/kafka/templates/statefulset.yaml
@@ -1,23 +1,23 @@
 apiVersion: apps/v1beta1
 kind: StatefulSet
 metadata:
-  name: {{ template "fullname" . }}
+  name: {{ template "kafka.fullname" . }}
   labels:
-    app: {{ include "name" . | quote }}
+    app: {{ include "kafka.name" . | quote }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     release: {{ .Release.Name | quote }}
     heritage: {{ .Release.Service | quote }}
 spec:
-  serviceName: {{ template "fullname" . }}-headless
+  serviceName: {{ template "kafka.fullname" . }}-headless
   replicas: {{ default 3 .Values.Replicas }}
   template:
     metadata:
       labels:
-        app: {{ include "name" . | quote }}
+        app: {{ include "kafka.name" . | quote }}
         release: {{ .Release.Name | quote }}
     spec:
       containers:
-      - name: {{ template "name" . }}-broker
+      - name: {{ template "kafka.name" . }}-broker
         image: "{{ .Values.Image }}:{{ .Values.ImageTag }}"
         imagePullPolicy: "{{ .Values.ImagePullPolicy }}"
         livenessProbe: