diff --git a/stable/magento/Chart.yaml b/stable/magento/Chart.yaml
index fd8767c934a8..60de8c73b899 100644
--- a/stable/magento/Chart.yaml
+++ b/stable/magento/Chart.yaml
@@ -1,5 +1,5 @@
 name: magento
-version: 0.4.16
+version: 0.5.0
 appVersion: 2.2.0
 description: A feature-rich flexible e-commerce solution. It includes transaction options, multi-store functionality, loyalty programs, product categorization and shopper filtering, promotion rules, and more.
 keywords:
diff --git a/stable/magento/templates/NOTES.txt b/stable/magento/templates/NOTES.txt
index 8afc2574d9e5..9cdbe901ecaf 100644
--- a/stable/magento/templates/NOTES.txt
+++ b/stable/magento/templates/NOTES.txt
@@ -1,4 +1,4 @@
-{{- if empty (include "host" .) -}}
+{{- if empty (include "magento.host" .) -}}
 ###############################################################################
 ### ERROR: You did not provide an external host in your 'helm install' call ###
 ###############################################################################
@@ -10,18 +10,18 @@ host. To configure Magento with the URL of your service:
 
   {{- if contains "NodePort" .Values.serviceType }}
 
-  export APP_PORT=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath="{.spec.ports[0].nodePort}")
+  export APP_PORT=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "magento.fullname" . }} -o jsonpath="{.spec.ports[0].nodePort}")
   export APP_HOST=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
 
   {{- else if contains "LoadBalancer" .Values.serviceType }}
 
   NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-        Watch the status with: 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "fullname" . }}'
+        Watch the status with: 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "magento.fullname" . }}'
 
-  export APP_HOST=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "fullname" . }} --template "{{ "{{ range (index .status.loadBalancer.ingress 0) }}{{ . }}{{ end }}" }}")
-  export APP_PASSWORD=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath="{.data.magento-password}" | base64 --decode)
+  export APP_HOST=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "magento.fullname" . }} --template "{{ "{{ range (index .status.loadBalancer.ingress 0) }}{{ . }}{{ end }}" }}")
+  export APP_PASSWORD=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "magento.fullname" . }} -o jsonpath="{.data.magento-password}" | base64 --decode)
   {{- if .Values.mariadb.mariadbRootPassword }}
-  export APP_DATABASE_PASSWORD=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "mariadb.fullname" . }} -o jsonpath="{.data.mariadb-root-password}" | base64 --decode)
+  export APP_DATABASE_PASSWORD=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "magento.mariadb.fullname" . }} -o jsonpath="{.data.mariadb-root-password}" | base64 --decode)
   {{- end }}
   {{- end }}
 
@@ -35,17 +35,17 @@ host. To configure Magento with the URL of your service:
 
 {{- if eq .Values.serviceType "ClusterIP" }}
 
-  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "fullname" . }}" -o jsonpath="{.items[0].metadata.name}")
+  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "magento.fullname" . }}" -o jsonpath="{.items[0].metadata.name}")
   echo http://127.0.0.1:8080/
   kubectl port-forward $POD_NAME 8080:80
 {{- else }}
 
-  echo Store URL : http://{{ include "host" . }}/
-  echo Admin URL : http://{{ include "host" . }}/{{ .Values.magentoAdminUri }}
+  echo Store URL : http://{{ include "magento.host" . }}/
+  echo Admin URL : http://{{ include "magento.host" . }}/{{ .Values.magentoAdminUri }}
 {{- end }}
 
 2. Get your Magento login credentials by running:
 
   echo Username: {{ .Values.magentoUsername }}
-  echo Password: $(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath="{.data.magento-password}" | base64 --decode)
+  echo Password: $(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "magento.fullname" . }} -o jsonpath="{.data.magento-password}" | base64 --decode)
 {{- end }}
diff --git a/stable/magento/templates/_helpers.tpl b/stable/magento/templates/_helpers.tpl
index 81de96f42a43..7501c78a089d 100644
--- a/stable/magento/templates/_helpers.tpl
+++ b/stable/magento/templates/_helpers.tpl
@@ -2,7 +2,7 @@
 {{/*
 Expand the name of the chart.
 */}}
-{{- define "name" -}}
+{{- define "magento.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 "magento.fullname" -}}
 {{- $name := default .Chart.Name .Values.nameOverride -}}
 {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
@@ -19,23 +19,23 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 Create a random alphanumeric password string.
 We append a random number to the string to avoid password validation errors
 */}}
-{{- define "randomPassword" -}}
+{{- define "magento.randomPassword" -}}
 {{- randAlphaNum 9 -}}{{- randNumeric 1 -}}
 {{- end -}}
 
 {{/*
 Get the user defined password or use a random string
 */}}
-{{- define "password" -}}
+{{- define "magento.password" -}}
 {{- $password := index .Values (printf "%sPassword" .Chart.Name) -}}
-{{- default (include "randomPassword" .) $password -}}
+{{- default (include "magento.randomPassword" .) $password -}}
 {{- end -}}
 
 {{/*
 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 "mariadb.fullname" -}}
+{{- define "magento.mariadb.fullname" -}}
 {{- printf "%s-%s" .Release.Name "mariadb" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
@@ -43,7 +43,7 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 Get the user defined LoadBalancerIP for this release.
 Note, returns 127.0.0.1 if using ClusterIP.
 */}}
-{{- define "serviceIP" -}}
+{{- define "magento.serviceIP" -}}
 {{- if eq .Values.serviceType "ClusterIP" -}}
 127.0.0.1
 {{- else -}}
@@ -55,7 +55,7 @@ Note, returns 127.0.0.1 if using ClusterIP.
 Gets the host to be used for this application.
 If not using ClusterIP, or if a host or LoadBalancerIP is not defined, the value will be empty.
 */}}
-{{- define "host" -}}
+{{- define "magento.host" -}}
 {{- $host := index .Values (printf "%sHost" .Chart.Name) | default "" -}}
-{{- default (include "serviceIP" .) $host -}}
+{{- default (include "magento.serviceIP" .) $host -}}
 {{- end -}}
diff --git a/stable/magento/templates/apache-pvc.yaml b/stable/magento/templates/apache-pvc.yaml
index 1ae6762ef278..dd60a5e16d51 100644
--- a/stable/magento/templates/apache-pvc.yaml
+++ b/stable/magento/templates/apache-pvc.yaml
@@ -2,9 +2,9 @@
 kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
-  name: {{ template "fullname" . }}-apache
+  name: {{ template "magento.fullname" . }}-apache
   labels:
-    app: {{ template "fullname" . }}
+    app: {{ template "magento.fullname" . }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
diff --git a/stable/magento/templates/deployment.yaml b/stable/magento/templates/deployment.yaml
index 61dd9586e4fe..1000ca3f683b 100644
--- a/stable/magento/templates/deployment.yaml
+++ b/stable/magento/templates/deployment.yaml
@@ -1,10 +1,10 @@
-{{- if include "host" . -}}
+{{- if include "magento.host" . -}}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: {{ template "fullname" . }}
+  name: {{ template "magento.fullname" . }}
   labels:
-    app: {{ template "fullname" . }}
+    app: {{ template "magento.fullname" . }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
@@ -12,30 +12,30 @@ spec:
   template:
     metadata:
       labels:
-        app: {{ template "fullname" . }}
+        app: {{ template "magento.fullname" . }}
     spec:
       containers:
-      - name: {{ template "fullname" . }}
+      - name: {{ template "magento.fullname" . }}
         image: "{{ .Values.image }}"
         imagePullPolicy: {{ default "" .Values.imagePullPolicy | quote }}
         env:
         - name: MARIADB_HOST
-          value: {{ template "mariadb.fullname" . }}
+          value: {{ template "magento.mariadb.fullname" . }}
         - name: MARIADB_PORT_NUMBER
           value: "3306"
         - name: MARIADB_PASSWORD
           valueFrom:
             secretKeyRef:
-              name: {{ template "mariadb.fullname" . }}
+              name: {{ template "magento.mariadb.fullname" . }}
               key: mariadb-root-password
         - name: MAGENTO_HOST
-          value: {{ include "host" . | quote }}
+          value: {{ include "magento.host" . | quote }}
         - name: MAGENTO_USERNAME
           value: {{ default "" .Values.magentoUsername | quote }}
         - name: MAGENTO_PASSWORD
           valueFrom:
             secretKeyRef:
-              name: {{ template "fullname" . }}
+              name: {{ template "magento.fullname" . }}
               key: magento-password
         - name: MAGENTO_EMAIL
           value: {{ default "" .Values.magentoEmail | quote }}
@@ -58,7 +58,7 @@ spec:
             port: http
             httpHeaders:
             - name: Host
-              value: {{ include "host" . | quote }}
+              value: {{ include "magento.host" . | quote }}
           initialDelaySeconds: 420
           timeoutSeconds: 5
           failureThreshold: 6
@@ -68,7 +68,7 @@ spec:
             port: http
             httpHeaders:
             - name: Host
-              value: {{ include "host" . | quote }}
+              value: {{ include "magento.host" . | quote }}
           initialDelaySeconds: 30
           timeoutSeconds: 3
           periodSeconds: 5
@@ -83,14 +83,14 @@ spec:
       - name: magento-data
       {{- if .Values.persistence.enabled }}
         persistentVolumeClaim:
-          claimName: {{ template "fullname" . }}-magento
+          claimName: {{ template "magento.fullname" . }}-magento
       {{- else }}
         emptyDir: {}
       {{- end }}
       - name: apache-data
       {{- if .Values.persistence.enabled }}
         persistentVolumeClaim:
-          claimName: {{ template "fullname" . }}-apache
+          claimName: {{ template "magento.fullname" . }}-apache
       {{- else }}
         emptyDir: {}
       {{- end }}
diff --git a/stable/magento/templates/magento-pvc.yaml b/stable/magento/templates/magento-pvc.yaml
index 47c9b040d4ba..c31da3dce23a 100644
--- a/stable/magento/templates/magento-pvc.yaml
+++ b/stable/magento/templates/magento-pvc.yaml
@@ -2,9 +2,9 @@
 kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
-  name: {{ template "fullname" . }}-magento
+  name: {{ template "magento.fullname" . }}-magento
   labels:
-    app: {{ template "fullname" . }}
+    app: {{ template "magento.fullname" . }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
diff --git a/stable/magento/templates/secrets.yaml b/stable/magento/templates/secrets.yaml
index f6c5ae6b7d67..d9acd6b2cbce 100644
--- a/stable/magento/templates/secrets.yaml
+++ b/stable/magento/templates/secrets.yaml
@@ -1,12 +1,12 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ template "fullname" . }}
+  name: {{ template "magento.fullname" . }}
   labels:
-    app: {{ template "fullname" . }}
+    app: {{ template "magento.fullname" . }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
 type: Opaque
 data:
-  magento-password: "{{ b64enc (include "password" .) }}"
+  magento-password: "{{ b64enc (include "magento.password" .) }}"
diff --git a/stable/magento/templates/svc.yaml b/stable/magento/templates/svc.yaml
index 33eaf7d3a329..93f2438e93b8 100644
--- a/stable/magento/templates/svc.yaml
+++ b/stable/magento/templates/svc.yaml
@@ -1,9 +1,9 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ template "fullname" . }}
+  name: {{ template "magento.fullname" . }}
   labels:
-    app: {{ template "fullname" . }}
+    app: {{ template "magento.fullname" . }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
@@ -20,4 +20,4 @@ spec:
     port: 443
     targetPort: https
   selector:
-    app: {{ template "fullname" . }}
+    app: {{ template "magento.fullname" . }}