diff --git a/stable/acs-engine-autoscaler/Chart.yaml b/stable/acs-engine-autoscaler/Chart.yaml
index 0349bd484718..4e39810367e8 100644
--- a/stable/acs-engine-autoscaler/Chart.yaml
+++ b/stable/acs-engine-autoscaler/Chart.yaml
@@ -2,11 +2,11 @@ apiVersion: v1
 description: Scales worker nodes within agent pools
 icon: https://github.com/kubernetes/kubernetes/blob/master/logo/logo.png
 name: acs-engine-autoscaler
-version: 1.0.0
+version: 2.0.0
 sources:
-  - https://github.com/wbuchwalter/Kubernetes-acs-engine-autoscaler
+- https://github.com/wbuchwalter/Kubernetes-acs-engine-autoscaler
 maintainers:
-  - name: Rita Zhang
-    email: ritazh@microsoft.com
-  - name: William Buchwalter
-    email: wibuch@microsoft.com
+- name: Rita Zhang
+  email: ritazh@microsoft.com
+- name: William Buchwalter
+  email: wibuch@microsoft.com
diff --git a/stable/acs-engine-autoscaler/templates/NOTES.txt b/stable/acs-engine-autoscaler/templates/NOTES.txt
index 73074f35da77..fd28f50c3c67 100644
--- a/stable/acs-engine-autoscaler/templates/NOTES.txt
+++ b/stable/acs-engine-autoscaler/templates/NOTES.txt
@@ -4,10 +4,10 @@ The acs-engine-autoscaler is getting provisioned in your cluster. After a few mi
 
 To verify that acs-engine-autoscaler has started, run:
 
-  kubectl --namespace={{ .Release.Namespace }} get pods -l "app={{ template "name" . }}"
+  kubectl --namespace={{ .Release.Namespace }} get pods -l "app={{ template "acs-engine-autoscaler.name" . }}"
 
 To verify that acs-engine-autoscaler is running as expected, run:
-  kubectl logs $(kubectl --namespace={{ .Release.Namespace }} get pods -l "app={{ template "name" . }}" -o jsonpath="{.items[0].metadata.name}")
+  kubectl logs $(kubectl --namespace={{ .Release.Namespace }} get pods -l "app={{ template "acs-engine-autoscaler.name" . }}" -o jsonpath="{.items[0].metadata.name}")
 
 {{- else -}}
 ##############################################################################
diff --git a/stable/acs-engine-autoscaler/templates/_helpers.tpl b/stable/acs-engine-autoscaler/templates/_helpers.tpl
index 81b03cdf5fc1..cd2e109cda2f 100644
--- a/stable/acs-engine-autoscaler/templates/_helpers.tpl
+++ b/stable/acs-engine-autoscaler/templates/_helpers.tpl
@@ -2,7 +2,7 @@
 {{/*
 Expand the name of the chart.
 */}}
-{{- define "name" -}}
+{{- define "acs-engine-autoscaler.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 "acs-engine-autoscaler.fullname" -}}
 {{- $name := default .Chart.Name .Values.nameOverride -}}
 {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
@@ -21,11 +21,11 @@ https://github.com/technosophos/common-chart/
 labels.standard prints the standard Helm labels.
 The standard labels are frequently used in metadata.
 */ -}}
-{{- define "labels.standard" -}}
-app: {{ template "name" . }}
+{{- define "acs-engine-autoscaler.labels.standard" -}}
+app: {{ template "acs-engine-autoscaler.name" . }}
 heritage: {{ .Release.Service | quote }}
 release: {{ .Release.Name | quote }}
-chart: {{ template "chartref" . }}
+chart: {{ template "acs-engine-autoscaler.chartref" . }}
 {{- end -}}
 
 {{- /*
@@ -37,6 +37,6 @@ Example output:
   zookeeper-1.2.3
   wordpress-3.2.1_20170219
 */ -}}
-{{- define "chartref" -}}
+{{- define "acs-engine-autoscaler.chartref" -}}
   {{- replace "+" "_" .Chart.Version | printf "%s-%s" .Chart.Name -}}
 {{- end -}}
\ No newline at end of file
diff --git a/stable/acs-engine-autoscaler/templates/deployment.yaml b/stable/acs-engine-autoscaler/templates/deployment.yaml
index 0027050208d9..c7b52f2c46be 100644
--- a/stable/acs-engine-autoscaler/templates/deployment.yaml
+++ b/stable/acs-engine-autoscaler/templates/deployment.yaml
@@ -2,50 +2,50 @@
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: {{ template "fullname" . }}
+  name: {{ template "acs-engine-autoscaler.fullname" . }}
   labels:
-{{ include "labels.standard" . | indent 4 }}
+{{ include "acs-engine-autoscaler.labels.standard" . | indent 4 }}
 spec:
   replicas: {{ .Values.replicaCount }}
   template:
     metadata:
       labels:
-{{ include "labels.standard" . | indent 8 }}
+{{ include "acs-engine-autoscaler.labels.standard" . | indent 8 }}
         openai/do-not-drain: "true"
     spec:
       containers:
-      - name: {{ template "fullname" . }}
+      - name: {{ template "acs-engine-autoscaler.fullname" . }}
         image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
         env:
         - name: AZURE_SP_APP_ID
           valueFrom:
             secretKeyRef:
-              name: {{ template "fullname" . }}
+              name: {{ template "acs-engine-autoscaler.fullname" . }}
               key: azure-sp-app-id
         - name: AZURE_SP_SECRET
           valueFrom:
             secretKeyRef:
-              name: {{ template "fullname" . }}
+              name: {{ template "acs-engine-autoscaler.fullname" . }}
               key: azure-sp-secret
         - name: AZURE_SP_TENANT_ID
           valueFrom:
             secretKeyRef:
-              name: {{ template "fullname" . }}
+              name: {{ template "acs-engine-autoscaler.fullname" . }}
               key: azure-sp-tenant-id
         - name: KUBECONFIG_PRIVATE_KEY
           valueFrom:
             secretKeyRef:
-              name: {{ template "fullname" . }}
+              name: {{ template "acs-engine-autoscaler.fullname" . }}
               key: kubeconfig-private-key
         - name: CLIENT_PRIVATE_KEY
           valueFrom:
             secretKeyRef:
-              name: {{ template "fullname" . }}
+              name: {{ template "acs-engine-autoscaler.fullname" . }}
               key: client-private-key
         - name: CA_PRIVATE_KEY
           valueFrom:
             secretKeyRef:
-              name: {{ template "fullname" . }}
+              name: {{ template "acs-engine-autoscaler.fullname" . }}
               key: ca-private-key
         command:
             - python
diff --git a/stable/acs-engine-autoscaler/templates/secrets.yaml b/stable/acs-engine-autoscaler/templates/secrets.yaml
index e03b8de9a853..83e8ded720ca 100644
--- a/stable/acs-engine-autoscaler/templates/secrets.yaml
+++ b/stable/acs-engine-autoscaler/templates/secrets.yaml
@@ -1,9 +1,9 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ template "fullname" . }}
+  name: {{ template "acs-engine-autoscaler.fullname" . }}
   labels:
-{{ include "labels.standard" . | indent 4 }}
+{{ include "acs-engine-autoscaler.labels.standard" . | indent 4 }}
 type: Opaque
 data:
   azure-sp-app-id: {{ default "MISSING" .Values.acsenginecluster.azurespappid | b64enc | quote }}