diff --git a/stable/dask-distributed/Chart.yaml b/stable/dask-distributed/Chart.yaml
index e21196ee26a2..5251f45f76c4 100755
--- a/stable/dask-distributed/Chart.yaml
+++ b/stable/dask-distributed/Chart.yaml
@@ -1,10 +1,10 @@
 name: dask-distributed
-version: 1.16.4
+version: 2.0.0
 description: Distributed computation in Python
 home: https://github.com/dask/distributed
 icon: https://avatars3.githubusercontent.com/u/17131925?v=3&s=200
 sources:
-  - https://github.com/dask/distributed
+- https://github.com/dask/distributed
 maintainers:
-  - name: danielfrg
-    email: df.rodriguez143@gmail.com
+- name: danielfrg
+  email: df.rodriguez143@gmail.com
diff --git a/stable/dask-distributed/templates/NOTES.txt b/stable/dask-distributed/templates/NOTES.txt
index e366356dc4b7..e3c0bbbfd29b 100644
--- a/stable/dask-distributed/templates/NOTES.txt
+++ b/stable/dask-distributed/templates/NOTES.txt
@@ -1,25 +1,25 @@
 1. Get the Dask Scheduler connection string by running this commands in the same shell:
 
   NOTE: It may take a few minutes for the LoadBalancer IP to be available, until that the commands below will not work.  
-  You can watch the status by running 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "scheduler-fullname" . }}'
+  You can watch the status by running 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "dask-distributed.scheduler-fullname" . }}'
 
-  export DASK_SCHEDULER=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "scheduler-fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
+  export DASK_SCHEDULER=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "dask-distributed.scheduler-fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
   echo http://$DASK_SCHEDULER:{{ .Values.scheduler.servicePort }}
 
 2. Get the Dask Scheduler Web UI by running this commands in the same shell:
 
   NOTE: It may take a few minutes for the LoadBalancer IP to be available, until that the commands below will not work.  
-  You can watch the status by running 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "scheduler-fullname" . }}'
+  You can watch the status by running 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "dask-distributed.scheduler-fullname" . }}'
 
-  export DASK_SCHEDULER_UI_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "scheduler-fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
+  export DASK_SCHEDULER_UI_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "dask-distributed.scheduler-fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
   echo http://$DASK_SCHEDULER_UI_IP:{{ .Values.webUI.servicePort }}
 
 3. Get the Jupyter Notebook URL to visit by running these commands in the same shell:
 
   NOTE: It may take a few minutes for the LoadBalancer IP to be available, until that the commands below will not work.  
-  You can watch the status by running 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "jupyter-fullname" . }}'
+  You can watch the status by running 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "dask-distributed.jupyter-fullname" . }}'
 
   NOTE: The default password to login is `dask`.
   
-  export JUPYTER_NOTEBOOK_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "jupyter-fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
+  export JUPYTER_NOTEBOOK_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "dask-distributed.jupyter-fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
   echo http://$JUPYTER_NOTEBOOK_IP:{{ .Values.jupyter.servicePort }}
diff --git a/stable/dask-distributed/templates/_helpers.tpl b/stable/dask-distributed/templates/_helpers.tpl
index f3d10f775f37..cd2ace31b8fd 100644
--- a/stable/dask-distributed/templates/_helpers.tpl
+++ b/stable/dask-distributed/templates/_helpers.tpl
@@ -2,7 +2,7 @@
 {{/*
 Expand the name of the chart.
 */}}
-{{- define "name" -}}
+{{- define "dask-distributed.name" -}}
 {{- default .Chart.Name .Values.nameOverride | trunc 24 -}}
 {{- end -}}
 
@@ -10,22 +10,22 @@ Expand the name of the chart.
 Create fully qualified names.
 We truncate at 24 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 */}}
-{{- define "scheduler-fullname" -}}
+{{- define "dask-distributed.scheduler-fullname" -}}
 {{- $name := default .Chart.Name .Values.scheduler.name -}}
 {{- printf "%s-%s" .Release.Name $name | trunc 24 -}}
 {{- end -}}
 
-{{- define "webui-fullname" -}}
+{{- define "dask-distributed.webui-fullname" -}}
 {{- $name := default .Chart.Name .Values.webUI.name -}}
 {{- printf "%s-%s" .Release.Name $name | trunc 24 -}}
 {{- end -}}
 
-{{- define "worker-fullname" -}}
+{{- define "dask-distributed.worker-fullname" -}}
 {{- $name := default .Chart.Name .Values.worker.name -}}
 {{- printf "%s-%s" .Release.Name $name | trunc 24 -}}
 {{- end -}}
 
-{{- define "jupyter-fullname" -}}
+{{- define "dask-distributed.jupyter-fullname" -}}
 {{- $name := default .Chart.Name .Values.jupyter.name -}}
 {{- printf "%s-%s" .Release.Name $name | trunc 24 -}}
 {{- end -}}
diff --git a/stable/dask-distributed/templates/dask-jupyter-config.yaml b/stable/dask-distributed/templates/dask-jupyter-config.yaml
index c241247f8ace..f9ebe13abd89 100644
--- a/stable/dask-distributed/templates/dask-jupyter-config.yaml
+++ b/stable/dask-distributed/templates/dask-jupyter-config.yaml
@@ -1,9 +1,9 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ template "jupyter-fullname" . }}-config
+  name: {{ template "dask-distributed.jupyter-fullname" . }}-config
   labels:
-    app: {{ template "name" . }}
+    app: {{ template "dask-distributed.name" . }}
     heritage: {{ .Release.Service | quote }}
     release: {{ .Release.Name | quote }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
diff --git a/stable/dask-distributed/templates/dask-jupyter-deployment.yaml b/stable/dask-distributed/templates/dask-jupyter-deployment.yaml
index 907c603929da..39d02b74e102 100644
--- a/stable/dask-distributed/templates/dask-jupyter-deployment.yaml
+++ b/stable/dask-distributed/templates/dask-jupyter-deployment.yaml
@@ -1,9 +1,9 @@
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: {{ template "jupyter-fullname" . }}
+  name: {{ template "dask-distributed.jupyter-fullname" . }}
   labels:
-    app: {{ template "name" . }}
+    app: {{ template "dask-distributed.name" . }}
     heritage: {{ .Release.Service | quote }}
     release: {{ .Release.Name | quote }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
@@ -15,12 +15,12 @@ spec:
   template:
     metadata:
       labels:
-        app: {{ template "name" . }}
+        app: {{ template "dask-distributed.name" . }}
         release: {{ .Release.Name | quote }}
         component: "{{ .Release.Name }}-{{ .Values.jupyter.component }}"
     spec:
       containers:
-        - name: {{ template "jupyter-fullname" . }}
+        - name: {{ template "dask-distributed.jupyter-fullname" . }}
           image: "{{ .Values.jupyter.image }}:{{ .Values.jupyter.imageTag }}"
           ports:
             - containerPort: {{ .Values.jupyter.containerPort }}
@@ -32,4 +32,4 @@ spec:
       volumes:
       - name: config-volume
         configMap:
-          name: {{ template "jupyter-fullname" . }}-config
+          name: {{ template "dask-distributed.jupyter-fullname" . }}-config
diff --git a/stable/dask-distributed/templates/dask-jupyter-service.yaml b/stable/dask-distributed/templates/dask-jupyter-service.yaml
index 86dd4adbe427..46e1ea0aec0e 100644
--- a/stable/dask-distributed/templates/dask-jupyter-service.yaml
+++ b/stable/dask-distributed/templates/dask-jupyter-service.yaml
@@ -1,9 +1,9 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ template "jupyter-fullname" . }}
+  name: {{ template "dask-distributed.jupyter-fullname" . }}
   labels:
-    app: {{ template "name" . }}
+    app: {{ template "dask-distributed.name" . }}
     heritage: {{ .Release.Service | quote }}
     release: {{ .Release.Name | quote }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
@@ -13,7 +13,7 @@ spec:
     - port: {{ .Values.jupyter.servicePort }}
       targetPort: {{ .Values.jupyter.containerPort }}
   selector:
-    app: {{ template "name" . }}
+    app: {{ template "dask-distributed.name" . }}
     release: {{ .Release.Name | quote }}
     component: "{{ .Release.Name }}-{{ .Values.jupyter.component }}"
   type: {{ .Values.jupyter.serviceType }}
diff --git a/stable/dask-distributed/templates/dask-scheduler-deployment.yaml b/stable/dask-distributed/templates/dask-scheduler-deployment.yaml
index ee7427952318..3231d44a77a0 100644
--- a/stable/dask-distributed/templates/dask-scheduler-deployment.yaml
+++ b/stable/dask-distributed/templates/dask-scheduler-deployment.yaml
@@ -1,9 +1,9 @@
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: {{ template "scheduler-fullname" . }}
+  name: {{ template "dask-distributed.scheduler-fullname" . }}
   labels:
-    app: {{ template "name" . }}
+    app: {{ template "dask-distributed.name" . }}
     heritage: {{ .Release.Service | quote }}
     release: {{ .Release.Name | quote }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
@@ -15,12 +15,12 @@ spec:
   template:
     metadata:
       labels:
-        app: {{ template "name" . }}
+        app: {{ template "dask-distributed.name" . }}
         release: {{ .Release.Name | quote }}
         component: "{{ .Release.Name }}-{{ .Values.scheduler.component }}"
     spec:
       containers:
-        - name: {{ template "scheduler-fullname" . }}
+        - name: {{ template "dask-distributed.scheduler-fullname" . }}
           image: "{{ .Values.scheduler.image }}:{{ .Values.scheduler.imageTag }}"
           command: ["dask-scheduler", "--port", "{{ .Values.scheduler.servicePort }}", "--bokeh-port", "{{ .Values.webUI.containerPort }}"]
           ports:
diff --git a/stable/dask-distributed/templates/dask-scheduler-service.yaml b/stable/dask-distributed/templates/dask-scheduler-service.yaml
index cc9380ebbfeb..6b6832c141fd 100644
--- a/stable/dask-distributed/templates/dask-scheduler-service.yaml
+++ b/stable/dask-distributed/templates/dask-scheduler-service.yaml
@@ -1,23 +1,23 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ template "scheduler-fullname" . }}
+  name: {{ template "dask-distributed.scheduler-fullname" . }}
   labels:
-    app: {{ template "name" . }}
+    app: {{ template "dask-distributed.name" . }}
     heritage: {{ .Release.Service | quote }}
     release: {{ .Release.Name | quote }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     component: "{{ .Release.Name }}-{{ .Values.scheduler.component }}"
 spec:
   ports:
-    - name: {{ template "scheduler-fullname" . }}
+    - name: {{ template "dask-distributed.scheduler-fullname" . }}
       port: {{ .Values.scheduler.servicePort }}
       targetPort: {{ .Values.scheduler.containerPort }}
-    - name: {{ template "webui-fullname" . }}
+    - name: {{ template "dask-distributed.webui-fullname" . }}
       port: {{ .Values.webUI.servicePort }}
       targetPort: {{ .Values.webUI.containerPort }}
   selector:
-    app: {{ template "name" . }}
+    app: {{ template "dask-distributed.name" . }}
     release: {{ .Release.Name | quote }}
     component: "{{ .Release.Name }}-{{ .Values.scheduler.component }}"
   type: {{ .Values.scheduler.serviceType }}
diff --git a/stable/dask-distributed/templates/dask-worker-deployment.yaml b/stable/dask-distributed/templates/dask-worker-deployment.yaml
index f397b63344f4..196ad0f74de4 100644
--- a/stable/dask-distributed/templates/dask-worker-deployment.yaml
+++ b/stable/dask-distributed/templates/dask-worker-deployment.yaml
@@ -1,9 +1,9 @@
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: {{ template "worker-fullname" . }}
+  name: {{ template "dask-distributed.worker-fullname" . }}
   labels:
-    app: {{ template "name" . }}
+    app: {{ template "dask-distributed.name" . }}
     heritage: {{ .Release.Service | quote }}
     release: {{ .Release.Name | quote }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
@@ -15,14 +15,14 @@ spec:
   template:
     metadata:
       labels:
-        app: {{ template "name" . }}
+        app: {{ template "dask-distributed.name" . }}
         release: {{ .Release.Name | quote }}
         component: "{{ .Release.Name }}-{{ .Values.worker.component }}"
     spec:
       containers:
-        - name: {{ template "worker-fullname" . }}
+        - name: {{ template "dask-distributed.worker-fullname" . }}
           image: "{{ .Values.worker.image }}:{{ .Values.worker.imageTag }}"
-          command: ["dask-worker", "{{ template "scheduler-fullname" . }}:{{ .Values.scheduler.servicePort }}"]
+          command: ["dask-worker", "{{ template "dask-distributed.scheduler-fullname" . }}:{{ .Values.scheduler.servicePort }}"]
           ports:
             - containerPort: {{ .Values.worker.containerPort }}
           resources: