diff --git a/guacamole/Chart.yaml b/guacamole/Chart.yaml
index c84f435..4ee4645 100644
--- a/guacamole/Chart.yaml
+++ b/guacamole/Chart.yaml
@@ -15,11 +15,11 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.2
+version: 0.1.3
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 appVersion: v1.2.0
 
-icon: https://git.ervine.org/jonny/charts/raw/branch/master/guacamole/guacamole.png
\ No newline at end of file
+icon: https://git.ervine.org/jonny/charts/raw/branch/master/guacamole/guacamole.png
diff --git a/guacamole/templates/guacamole.yaml b/guacamole/templates/guacamole-app.yaml
similarity index 98%
rename from guacamole/templates/guacamole.yaml
rename to guacamole/templates/guacamole-app.yaml
index 61bf2b4..32ed5f3 100644
--- a/guacamole/templates/guacamole.yaml
+++ b/guacamole/templates/guacamole-app.yaml
@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "guacamole.fullname" . }}
+  name: {{ include "guacamole.fullname" . }}-app
   labels:
     {{- include "guacamole.labels" . | nindent 4 }}
 spec:
diff --git a/guacamole/templates/guacamole-daemon-service.yaml b/guacamole/templates/guacamole-daemon-service.yaml
index adc1551..6fde329 100644
--- a/guacamole/templates/guacamole-daemon-service.yaml
+++ b/guacamole/templates/guacamole-daemon-service.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "guacamole.fullname" . }}
+  name: {{ include "guacamole.fullname" . }}-daemon
   labels:
     {{- include "guacamole.labels" . | nindent 4 }}
 spec:
diff --git a/guacamole/templates/guacamole-daemon.yaml b/guacamole/templates/guacamole-daemon.yaml
index d43dc2c..fdf0d5d 100644
--- a/guacamole/templates/guacamole-daemon.yaml
+++ b/guacamole/templates/guacamole-daemon.yaml
@@ -1,9 +1,9 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "guacamole-daemon.fullname" . }}
+  name: {{ include "guacamole.fullname" . }}-daemon
   labels:
-    {{- include "guacamole-daemon.labels" . | nindent 4 }}
+    {{- include "guacamole.labels" . | nindent 4 }}
 spec:
 {{- if not .Values.autoscaling.enabled }}
   replicas: {{ .Values.guacd.replicaCount }}
@@ -24,7 +24,7 @@ spec:
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      serviceAccountName: {{ include "guacamole-daemon.serviceAccountName" . }}
+      serviceAccountName: {{ include "guacamole.serviceAccountName" . }}
       securityContext:
         {{- toYaml .Values.guacd.podSecurityContext | nindent 8 }}
       containers:
diff --git a/guacamole/templates/tests/test-connection.yaml b/guacamole/templates/tests/test-connection.yaml
index d24f072..ed6c270 100644
--- a/guacamole/templates/tests/test-connection.yaml
+++ b/guacamole/templates/tests/test-connection.yaml
@@ -11,5 +11,5 @@ spec:
     - name: wget
       image: busybox
       command: ['wget']
-      args: ['{{ include "guacamole.fullname" . }}:{{ .Values.service.port }}']
+      args: ['{{ include "guacamole.fullname" . }}:{{ .Values.guacamole.service.port }}']
   restartPolicy: Never