diff --git a/starters/touch-docs/.helmignore b/starters/touchin-docs/.helmignore
similarity index 100%
rename from starters/touch-docs/.helmignore
rename to starters/touchin-docs/.helmignore
diff --git a/starters/touch-docs/Chart.yaml b/starters/touchin-docs/Chart.yaml
similarity index 100%
rename from starters/touch-docs/Chart.yaml
rename to starters/touchin-docs/Chart.yaml
diff --git a/starters/touch-docs/templates/NOTES.txt b/starters/touchin-docs/templates/NOTES.txt
similarity index 100%
rename from starters/touch-docs/templates/NOTES.txt
rename to starters/touchin-docs/templates/NOTES.txt
diff --git a/starters/touch-server/templates/_helpers.tpl b/starters/touchin-docs/templates/_helpers.tpl
similarity index 73%
rename from starters/touch-server/templates/_helpers.tpl
rename to starters/touchin-docs/templates/_helpers.tpl
index 654464e..039985f 100644
--- a/starters/touch-server/templates/_helpers.tpl
+++ b/starters/touchin-docs/templates/_helpers.tpl
@@ -57,10 +57,6 @@ app.kubernetes.io/releaseName: {{ .Values.releaseName }}
 {{- if .Values.component }}
 app.kubernetes.io/component: {{ .Values.component }}
 {{- end }}
-{{- if and .Values.db .Values.db.platform }}
-app.kubernetes.io/database: {{ .Values.db.platform.name }}
-app.kubernetes.io/database/version: {{ .Values.db.platform.version | quote }}
-{{- end }}
 {{- end }}
 
 {{/*
@@ -74,26 +70,3 @@ Create the name of the service account to use
 {{- end }}
 {{- end }}
 
-{{/*
-Create db environments
-*/}}
-{{- define "<CHARTNAME>.db.environments" -}}
-{{- if eq .Values.db.platform.name "postgres" }}
-- name: PGPASSWORD
-  valueFrom:
-    secretKeyRef:
-      name: "postgres{{ .Values.db.platform.version }}-postgresql"
-      key: postgres-password
-- name: PGHOST
-  value: "postgres{{ .Values.db.platform.version }}"
-- name: PGUSER
-  value: "postgres"
-{{- end }}
-{{- end }}
-
-{{/*
-Get db name
-*/}}
-{{- define "<CHARTNAME>.db.name" -}}
-{{ .Values.db.name }}{{- if .Values.releaseName}}--{{ .Values.releaseName }}{{- end }}
-{{- end }}
diff --git a/starters/touch-docs/templates/deployment.yaml b/starters/touchin-docs/templates/deployment.yaml
similarity index 97%
rename from starters/touch-docs/templates/deployment.yaml
rename to starters/touchin-docs/templates/deployment.yaml
index b5cb22f..053fcb7 100644
--- a/starters/touch-docs/templates/deployment.yaml
+++ b/starters/touchin-docs/templates/deployment.yaml
@@ -1,4 +1,3 @@
-{{- $dbName := include "<CHARTNAME>.db.name" . -}}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
diff --git a/starters/touch-docs/templates/hpa.yaml b/starters/touchin-docs/templates/hpa.yaml
similarity index 100%
rename from starters/touch-docs/templates/hpa.yaml
rename to starters/touchin-docs/templates/hpa.yaml
diff --git a/starters/touch-docs/templates/ingress.yaml b/starters/touchin-docs/templates/ingress.yaml
similarity index 100%
rename from starters/touch-docs/templates/ingress.yaml
rename to starters/touchin-docs/templates/ingress.yaml
diff --git a/starters/touch-docs/templates/service.yaml b/starters/touchin-docs/templates/service.yaml
similarity index 100%
rename from starters/touch-docs/templates/service.yaml
rename to starters/touchin-docs/templates/service.yaml
diff --git a/starters/touch-docs/templates/serviceaccount.yaml b/starters/touchin-docs/templates/serviceaccount.yaml
similarity index 100%
rename from starters/touch-docs/templates/serviceaccount.yaml
rename to starters/touchin-docs/templates/serviceaccount.yaml
diff --git a/starters/touch-docs/values.yaml b/starters/touchin-docs/values.yaml
similarity index 100%
rename from starters/touch-docs/values.yaml
rename to starters/touchin-docs/values.yaml
diff --git a/starters/touch-server/.helmignore b/starters/touchin-server/.helmignore
similarity index 100%
rename from starters/touch-server/.helmignore
rename to starters/touchin-server/.helmignore
diff --git a/starters/touch-server/Chart.yaml b/starters/touchin-server/Chart.yaml
similarity index 100%
rename from starters/touch-server/Chart.yaml
rename to starters/touchin-server/Chart.yaml
diff --git a/starters/touch-server/templates/NOTES.txt b/starters/touchin-server/templates/NOTES.txt
similarity index 100%
rename from starters/touch-server/templates/NOTES.txt
rename to starters/touchin-server/templates/NOTES.txt
diff --git a/starters/touch-docs/templates/_helpers.tpl b/starters/touchin-server/templates/_helpers.tpl
similarity index 100%
rename from starters/touch-docs/templates/_helpers.tpl
rename to starters/touchin-server/templates/_helpers.tpl
diff --git a/starters/touch-server/templates/deployment.yaml b/starters/touchin-server/templates/deployment.yaml
similarity index 100%
rename from starters/touch-server/templates/deployment.yaml
rename to starters/touchin-server/templates/deployment.yaml
diff --git a/starters/touch-server/templates/hpa.yaml b/starters/touchin-server/templates/hpa.yaml
similarity index 100%
rename from starters/touch-server/templates/hpa.yaml
rename to starters/touchin-server/templates/hpa.yaml
diff --git a/starters/touch-server/templates/ingress.yaml b/starters/touchin-server/templates/ingress.yaml
similarity index 100%
rename from starters/touch-server/templates/ingress.yaml
rename to starters/touchin-server/templates/ingress.yaml
diff --git a/starters/touch-server/templates/service.yaml b/starters/touchin-server/templates/service.yaml
similarity index 100%
rename from starters/touch-server/templates/service.yaml
rename to starters/touchin-server/templates/service.yaml
diff --git a/starters/touch-server/templates/serviceaccount.yaml b/starters/touchin-server/templates/serviceaccount.yaml
similarity index 100%
rename from starters/touch-server/templates/serviceaccount.yaml
rename to starters/touchin-server/templates/serviceaccount.yaml
diff --git a/starters/touch-server/values.yaml b/starters/touchin-server/values.yaml
similarity index 100%
rename from starters/touch-server/values.yaml
rename to starters/touchin-server/values.yaml