diff --git a/stable/fluent-bit/Chart.yaml b/stable/fluent-bit/Chart.yaml
index ea59395605f3..80fced0d0099 100755
--- a/stable/fluent-bit/Chart.yaml
+++ b/stable/fluent-bit/Chart.yaml
@@ -3,16 +3,16 @@ version: 0.2.0
 appVersion: 0.12.3
 description: Fast and Lightweight Log/Data Forwarder for Linux, BSD and OSX
 keywords:
-  - logging
-  - monitoring
-  - fluent
-  - fluentd
+- logging
+- monitoring
+- fluent
+- fluentd
 sources:
-  - http://fluentbit.io
+- http://fluentbit.io
 icon: http://fluentbit.io/assets/img/logo1-default.png
 home: http://fluentbit.io
 maintainers:
-  - name: kfox1111
-    email: Kevin.Fox@pnnl.gov
-  - name: edsiper
-    email: eduardo@treasure-data.com
+- name: kfox1111
+  email: Kevin.Fox@pnnl.gov
+- name: edsiper
+  email: eduardo@treasure-data.com
diff --git a/stable/fluent-bit/templates/_helpers.tpl b/stable/fluent-bit/templates/_helpers.tpl
index f0d83d2edba6..60a7147295db 100644
--- a/stable/fluent-bit/templates/_helpers.tpl
+++ b/stable/fluent-bit/templates/_helpers.tpl
@@ -2,7 +2,7 @@
 {{/*
 Expand the name of the chart.
 */}}
-{{- define "name" -}}
+{{- define "fluent-bit.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 "fluent-bit.fullname" -}}
 {{- $name := default .Chart.Name .Values.nameOverride -}}
 {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
diff --git a/stable/fluent-bit/templates/config.yaml b/stable/fluent-bit/templates/config.yaml
index 0593c44709eb..1a48cb7d68bb 100644
--- a/stable/fluent-bit/templates/config.yaml
+++ b/stable/fluent-bit/templates/config.yaml
@@ -1,9 +1,9 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ template "fullname" . }}-config
+  name: {{ template "fluent-bit.fullname" . }}-config
   labels:
-    app: {{ template "fullname" . }}
+    app: {{ template "fluent-bit.fullname" . }}
 data:
   fluent-bit.conf: |-
     [SERVICE]
diff --git a/stable/fluent-bit/templates/daemonset.yaml b/stable/fluent-bit/templates/daemonset.yaml
index 7ae48f7101a0..d88ff5f28c6b 100644
--- a/stable/fluent-bit/templates/daemonset.yaml
+++ b/stable/fluent-bit/templates/daemonset.yaml
@@ -3,12 +3,12 @@ kind: DaemonSet
 metadata:
   name: fluent-bit
   labels:
-    app: {{ template "fullname" . }}
+    app: {{ template "fluent-bit.fullname" . }}
 spec:
   template:
     metadata:
       labels:
-        app: {{ template "fullname" . }}
+        app: {{ template "fluent-bit.fullname" . }}
     spec:
       containers:
       - name: fluent-bit
@@ -50,7 +50,7 @@ spec:
           path: /var/lib/docker/containers
       - name: config
         configMap:
-          name: {{ template "fullname" . }}-config
+          name: {{ template "fluent-bit.fullname" . }}-config
 {{ if .Values.on_minikube }}
       - name: mnt
         hostPath: