diff --git a/charts/README.md b/charts/README.md
index f3d6e777f6..3298f4480c 100644
--- a/charts/README.md
+++ b/charts/README.md
@@ -33,7 +33,7 @@ Then, assuming you have an ingress controller running, run something like:
 ```shell
 $ helm install --name zenko --set ingress.enabled=true \
 --set ingress.hosts[0]=zenko.local \
---set cloudserver-front.endpoint=zenko.local zenko
+--set cloudserver.endpoint=zenko.local zenko
 ```
 
 You can disable integration with the [Orbit] management UI (enabled by default).
@@ -43,19 +43,19 @@ See `values.yml` for more options.
 To disable Orbit, use:
 
 ```shell
---set cloudserver-front.orbit.enabled=false
+--set cloudserver.orbit.enabled=false
 ```
 
 If a custom Orbit endpoint is required, use:
 
 ```shell
---set cloudserver-front.orbit.endpoint=https://custom.orbit.endpoint
---set cloudserver-front.orbit.pushEndpoint=https://custom.push.orbit.endpoint
+--set cloudserver.orbit.endpoint=https://custom.orbit.endpoint
+--set cloudserver.orbit.pushEndpoint=https://custom.push.orbit.endpoint
 ```
 
 and if `poll` mode is needed, use:
 ```shell
---set cloudserver-front.orbit.mode=poll
+--set cloudserver.orbit.mode=poll
 ```
 
 **Note:** `poll` mode should only be used when long-lived websocket connections
@@ -71,20 +71,20 @@ Autoscaling
 -----------
 
 This chart can be configured to deploy a `HorizontalPodAutoscaler` for
-`cloudserver-front`. This is disabled by default.
+`cloudserver`. This is disabled by default.
 
 To set up autoscaling based on CPU consumption, configure the amount of CPU a
-single `cloudserver-front` Pod requests. For example, to request one CPU to be
+single `cloudserver` Pod requests. For example, to request one CPU to be
 allocated:
 
 ```shell
---set cloudserver-front.resources.requests.cpu=1
+--set cloudserver.resources.requests.cpu=1
 ```
 
 Next, enable autoscaling using:
 
 ```shell
---set cloudserver-front.autoscaling.enabled=true
+--set cloudserver.autoscaling.enabled=true
 ```
 
 This scales up (and down) between 1 and 16 replicas, with 80% CPU
@@ -93,9 +93,9 @@ consumption as the per-Pod target.
 These defaults can be modified using:
 
 ```shell
---set cloudserver-front.autoscaling.config.minReplicas=...
---set cloudserver-front.autoscaling.config.maxReplicas==...
---set cloudserver-front.autoscaling.config.targetCPUUtilizationPercentage=...
+--set cloudserver.autoscaling.config.minReplicas=...
+--set cloudserver.autoscaling.config.maxReplicas==...
+--set cloudserver.autoscaling.config.targetCPUUtilizationPercentage=...
 ```
 
 Prometheus Monitoring
diff --git a/charts/backbeat/templates/api/deployment.yaml b/charts/backbeat/templates/api/deployment.yaml
index 4e7735dc43..70fc54b21f 100644
--- a/charts/backbeat/templates/api/deployment.yaml
+++ b/charts/backbeat/templates/api/deployment.yaml
@@ -33,7 +33,7 @@ spec:
             - name: KAFKA_HOSTS
               value: "{{- printf "%s-zenko-queue:9092" .Release.Name | trunc 63 | trimSuffix "-" -}}"
             - name: EXTENSIONS_REPLICATION_SOURCE_S3_HOST
-              value: "{{- printf "%s-cloudserver-front" .Release.Name | trunc 63 | trimSuffix "-" -}}"
+              value: "{{- printf "%s-cloudserver" .Release.Name | trunc 63 | trimSuffix "-" -}}"
             - name: EXTENSIONS_REPLICATION_SOURCE_S3_PORT
               value: "80"
             - name: REDIS_HOST
@@ -49,7 +49,7 @@ spec:
             - name: EXTENSIONS_REPLICATION_SOURCE_AUTH_ACCOUNT
               value: service-replication
             - name: EXTENSIONS_REPLICATION_DEST_BOOTSTRAPLIST
-              value: "{{- printf "%s-cloudserver-front:80" .Release.Name | trunc 63 | trimSuffix "-" -}}"
+              value: "{{- printf "%s-cloudserver:80" .Release.Name | trunc 63 | trimSuffix "-" -}}"
             - name: MONGODB_HOSTS
               value: "{{ template "backbeat.mongodb-hosts" . }}"
           livenessProbe:
diff --git a/charts/backbeat/templates/gc/deployment.yaml b/charts/backbeat/templates/gc/deployment.yaml
index 2e2b1aeeea..9cc3a3aa97 100644
--- a/charts/backbeat/templates/gc/deployment.yaml
+++ b/charts/backbeat/templates/gc/deployment.yaml
@@ -31,7 +31,7 @@ spec:
             - name: EXTENSIONS_GC_AUTH_ACCOUNT
               value: service-gc
             - name: S3_HOST
-              value: "{{- printf "%s-cloudserver-front" .Release.Name | trunc 63 | trimSuffix "-" -}}"
+              value: "{{- printf "%s-cloudserver" .Release.Name | trunc 63 | trimSuffix "-" -}}"
             - name: S3_PORT
               value: "80"
             - name: MONGODB_HOSTS
diff --git a/charts/backbeat/templates/lifecycle/consumer_deployment.yaml b/charts/backbeat/templates/lifecycle/consumer_deployment.yaml
index ee0cc3bcba..d28d22d038 100644
--- a/charts/backbeat/templates/lifecycle/consumer_deployment.yaml
+++ b/charts/backbeat/templates/lifecycle/consumer_deployment.yaml
@@ -31,7 +31,7 @@ spec:
             - name: MONGODB_HOSTS
               value: "{{ template "backbeat.mongodb-hosts" . }}"
             - name: S3_HOST
-              value: "{{- printf "%s-cloudserver-front" .Release.Name | trunc 63 | trimSuffix "-" -}}"
+              value: "{{- printf "%s-cloudserver" .Release.Name | trunc 63 | trimSuffix "-" -}}"
             - name: S3_PORT
               value: "80"
             - name: LOG_LEVEL
diff --git a/charts/backbeat/templates/lifecycle/producer_deployment.yaml b/charts/backbeat/templates/lifecycle/producer_deployment.yaml
index 8ab66bba92..472e3996b5 100644
--- a/charts/backbeat/templates/lifecycle/producer_deployment.yaml
+++ b/charts/backbeat/templates/lifecycle/producer_deployment.yaml
@@ -31,7 +31,7 @@ spec:
             - name: MONGODB_HOSTS
               value: "{{ template "backbeat.mongodb-hosts" . }}"
             - name: S3_HOST
-              value: "{{- printf "%s-cloudserver-front" .Release.Name | trunc 63 | trimSuffix "-" -}}"
+              value: "{{- printf "%s-cloudserver" .Release.Name | trunc 63 | trimSuffix "-" -}}"
             - name: S3_PORT
               value: "80"
             - name: LOG_LEVEL
diff --git a/charts/backbeat/templates/replication/data_processor_deployment.yaml b/charts/backbeat/templates/replication/data_processor_deployment.yaml
index 61bcb4ae9f..374a8b3ec1 100644
--- a/charts/backbeat/templates/replication/data_processor_deployment.yaml
+++ b/charts/backbeat/templates/replication/data_processor_deployment.yaml
@@ -37,7 +37,7 @@ spec:
             - name: EXTENSIONS_REPLICATION_SOURCE_AUTH_ACCOUNT
               value: service-replication
             - name: EXTENSIONS_REPLICATION_SOURCE_S3_HOST
-              value: "{{- printf "%s-cloudserver-front" .Release.Name | trunc 63 | trimSuffix "-" -}}"
+              value: "{{- printf "%s-cloudserver" .Release.Name | trunc 63 | trimSuffix "-" -}}"
             - name: EXTENSIONS_REPLICATION_SOURCE_S3_PORT
               value: "80"
             - name: EXTENSIONS_REPLICATION_DEST_AUTH_TYPE
@@ -45,7 +45,7 @@ spec:
             - name: EXTENSIONS_REPLICATION_DEST_AUTH_ACCOUNT
               value: service-replication
             - name: EXTENSIONS_REPLICATION_DEST_BOOTSTRAPLIST
-              value: "{{- printf "%s-cloudserver-front:80" .Release.Name | trunc 63 | trimSuffix "-" -}}"
+              value: "{{- printf "%s-cloudserver:80" .Release.Name | trunc 63 | trimSuffix "-" -}}"
             - name: MONGODB_HOSTS
               value: "{{ template "backbeat.mongodb-hosts" . }}"
             - name: REDIS_HOST
diff --git a/charts/backbeat/templates/replication/status_processor_deployment.yaml b/charts/backbeat/templates/replication/status_processor_deployment.yaml
index 3ae7efde6d..742d80177f 100644
--- a/charts/backbeat/templates/replication/status_processor_deployment.yaml
+++ b/charts/backbeat/templates/replication/status_processor_deployment.yaml
@@ -37,7 +37,7 @@ spec:
             - name: EXTENSIONS_REPLICATION_SOURCE_AUTH_ACCOUNT
               value: service-replication
             - name: EXTENSIONS_REPLICATION_SOURCE_S3_HOST
-              value: "{{- printf "%s-cloudserver-front" .Release.Name | trunc 63 | trimSuffix "-" -}}"
+              value: "{{- printf "%s-cloudserver" .Release.Name | trunc 63 | trimSuffix "-" -}}"
             - name: EXTENSIONS_REPLICATION_SOURCE_S3_PORT
               value: "80"
             - name: REDIS_HOST
diff --git a/charts/cloudserver-front/.helmignore b/charts/cloudserver/.helmignore
similarity index 100%
rename from charts/cloudserver-front/.helmignore
rename to charts/cloudserver/.helmignore
diff --git a/charts/cloudserver-front/Chart.yaml b/charts/cloudserver/Chart.yaml
similarity index 79%
rename from charts/cloudserver-front/Chart.yaml
rename to charts/cloudserver/Chart.yaml
index 564c7dc2f5..1f0142a73c 100644
--- a/charts/cloudserver-front/Chart.yaml
+++ b/charts/cloudserver/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
 appVersion: "0.1.5"
 description: A Helm chart for Kubernetes
-name: cloudserver-front
+name: cloudserver
 version: 0.1.4
diff --git a/charts/cloudserver-front/templates/NOTES.txt b/charts/cloudserver/templates/NOTES.txt
similarity index 77%
rename from charts/cloudserver-front/templates/NOTES.txt
rename to charts/cloudserver/templates/NOTES.txt
index 8b03e59f66..37e997ed9e 100644
--- a/charts/cloudserver-front/templates/NOTES.txt
+++ b/charts/cloudserver/templates/NOTES.txt
@@ -4,16 +4,16 @@
   http{{ if $.Values.ingress.tls }}s{{ end }}://{{ . }}{{ $.Values.ingress.path }}
 {{- end }}
 {{- else if contains "NodePort" .Values.service.type }}
-  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "cloudserver-front.fullname" . }})
+  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "cloudserver.fullname" . }})
   export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
   echo http://$NODE_IP:$NODE_PORT
 {{- else if contains "LoadBalancer" .Values.service.type }}
      NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-           You can watch the status of by running 'kubectl get svc -w {{ template "cloudserver-front.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "cloudserver-front.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
+           You can watch the status of by running 'kubectl get svc -w {{ template "cloudserver.fullname" . }}'
+  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "cloudserver.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
   echo http://$SERVICE_IP:{{ .Values.service.port }}
 {{- else if contains "ClusterIP" .Values.service.type }}
-  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "cloudserver-front.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "cloudserver.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
   echo "Visit http://127.0.0.1:8000 to use your application"
   kubectl port-forward $POD_NAME 8000:8000
 {{- end }}
diff --git a/charts/cloudserver-front/templates/_env.tpl b/charts/cloudserver/templates/_env.tpl
similarity index 88%
rename from charts/cloudserver-front/templates/_env.tpl
rename to charts/cloudserver/templates/_env.tpl
index 6399418d20..24165e86a5 100644
--- a/charts/cloudserver-front/templates/_env.tpl
+++ b/charts/cloudserver/templates/_env.tpl
@@ -1,4 +1,4 @@
-{{- define "cloudserver-front.env" }}
+{{- define "cloudserver.env" }}
 env:
   - name: DATA_HOST
     value: "{{- printf "%s-%s" .Release.Name "s3-data" | trunc 63 | trimSuffix "-" -}}"
@@ -17,7 +17,7 @@ env:
   - name: LOG_LEVEL
     value: {{ .Values.logging.level }}
   - name: ENDPOINT
-    value: "{{ .Release.Name }}-cloudserver-front,{{ .Values.endpoint }}"
+    value: "{{ .Release.Name }}-cloudserver,{{ .Values.endpoint }}"
   - name: HEALTHCHECKS_ALLOWFROM
     value: "{{ .Values.allowHealthchecksFrom }}"
   {{- if .Values.storageLimit.enabled }}
@@ -46,7 +46,7 @@ env:
   - name: S3METADATA
     value: "mongodb"
   - name: MONGODB_HOSTS
-    value: "{{ template "cloudserver-front.mongodb-hosts" . }}"
+    value: "{{ template "cloudserver.mongodb-hosts" . }}"
   - name: MONGODB_RS
     value: "{{ default "rs0" .Values.mongodb.replicaSet }}"
   {{- if .Values.orbit.enabled }}
@@ -62,12 +62,12 @@ env:
   - name: SCALITY_ACCESS_KEY_ID
     valueFrom:
       secretKeyRef:
-        name: {{ template "cloudserver-front.fullname" . }}
+        name: {{ template "cloudserver.fullname" . }}
         key: keyId
   - name: SCALITY_SECRET_ACCESS_KEY
     valueFrom:
       secretKeyRef:
-        name: {{ template "cloudserver-front.fullname" . }}
+        name: {{ template "cloudserver.fullname" . }}
         key: secretKey
   {{- end }}
 {{- end }}
diff --git a/charts/cloudserver-front/templates/_helpers.tpl b/charts/cloudserver/templates/_helpers.tpl
similarity index 88%
rename from charts/cloudserver-front/templates/_helpers.tpl
rename to charts/cloudserver/templates/_helpers.tpl
index 726157e7d6..57a102c419 100644
--- a/charts/cloudserver-front/templates/_helpers.tpl
+++ b/charts/cloudserver/templates/_helpers.tpl
@@ -2,7 +2,7 @@
 {{/*
 Expand the name of the chart.
 */}}
-{{- define "cloudserver-front.name" -}}
+{{- define "cloudserver.name" -}}
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
@@ -11,7 +11,7 @@ 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).
 If release name contains chart name it will be used as a full name.
 */}}
-{{- define "cloudserver-front.fullname" -}}
+{{- define "cloudserver.fullname" -}}
 {{- if .Values.fullnameOverride -}}
 {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
 {{- else -}}
@@ -27,14 +27,14 @@ If release name contains chart name it will be used as a full name.
 {{/*
 Create chart name and version as used by the chart label.
 */}}
-{{- define "cloudserver-front.chart" -}}
+{{- define "cloudserver.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
 {{/*
 Create the default mongodb replicaset hosts string
 */}}
-{{- define "cloudserver-front.mongodb-hosts" -}}
+{{- define "cloudserver.mongodb-hosts" -}}
 {{- $count := (atoi (printf "%d" (int64 .Values.mongodb.replicas))) -}}
 {{- $release := .Release.Name -}}
 {{- range $v := until $count }}{{ $release }}-mongodb-replicaset-{{ $v }}.{{ $release }}-mongodb-replicaset:27017{{ if ne $v (sub $count 1) }},{{- end -}}{{- end -}}
diff --git a/charts/cloudserver-front/templates/certificate.yaml b/charts/cloudserver/templates/certificate.yaml
similarity index 58%
rename from charts/cloudserver-front/templates/certificate.yaml
rename to charts/cloudserver/templates/certificate.yaml
index 52a5a8ee1f..0ce7016325 100644
--- a/charts/cloudserver-front/templates/certificate.yaml
+++ b/charts/cloudserver/templates/certificate.yaml
@@ -2,10 +2,10 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ template "cloudserver-front.fullname" . }}-proxy
+  name: {{ template "cloudserver.fullname" . }}-proxy
   labels:
-    app: {{ template "cloudserver-front.name" . }}
-    chart: {{ template "cloudserver-front.chart" . }}
+    app: {{ template "cloudserver.name" . }}
+    chart: {{ template "cloudserver.chart" . }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
 type: Opaque
diff --git a/charts/cloudserver-front/templates/deployment.yaml b/charts/cloudserver/templates/deployment.yaml
similarity index 82%
rename from charts/cloudserver-front/templates/deployment.yaml
rename to charts/cloudserver/templates/deployment.yaml
index 22937b5cfb..7db14439b5 100644
--- a/charts/cloudserver-front/templates/deployment.yaml
+++ b/charts/cloudserver/templates/deployment.yaml
@@ -1,17 +1,17 @@
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: {{ template "cloudserver-front.fullname" . }}
+  name: {{ template "cloudserver.fullname" . }}
   labels:
-    app: {{ template "cloudserver-front.name" . }}
-    chart: {{ template "cloudserver-front.chart" . }}
+    app: {{ template "cloudserver.name" . }}
+    chart: {{ template "cloudserver.chart" . }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
 spec:
   replicas: {{ .Values.replicaCount }}
   selector:
     matchLabels:
-      app: {{ template "cloudserver-front.name" . }}
+      app: {{ template "cloudserver.name" . }}
       release: {{ .Release.Name }}
   template:
     metadata:
@@ -20,7 +20,7 @@ spec:
         checksum/config: {{ include (print $.Template.BasePath "/certificate.yaml") . | sha256sum }}
         {{- end }}
       labels:
-        app: {{ template "cloudserver-front.name" . }}
+        app: {{ template "cloudserver.name" . }}
         release: {{ .Release.Name }}
     spec:
       containers:
@@ -30,7 +30,7 @@ spec:
           ports:
             - name: http
               containerPort: 8000
-{{ include "cloudserver-front.env" . | indent 10 }}
+{{ include "cloudserver.env" . | indent 10 }}
             - name: MANAGEMENT_MODE
               value: "{{- .Values.orbit.workerMode -}}"
             {{- range $key, $value := .Values.env }}
@@ -66,5 +66,5 @@ spec:
         {{- if .Values.proxy.caCert }}
         - name: proxy-cert
           secret:
-            secretName: {{ template "cloudserver-front.fullname" . }}-proxy
+            secretName: {{ template "cloudserver.fullname" . }}-proxy
         {{- end }}
diff --git a/charts/cloudserver-front/templates/hpa.yaml b/charts/cloudserver/templates/hpa.yaml
similarity index 71%
rename from charts/cloudserver-front/templates/hpa.yaml
rename to charts/cloudserver/templates/hpa.yaml
index ca8ef4a7b6..3198b08f36 100644
--- a/charts/cloudserver-front/templates/hpa.yaml
+++ b/charts/cloudserver/templates/hpa.yaml
@@ -2,9 +2,9 @@
 apiVersion: autoscaling/v1
 kind: HorizontalPodAutoscaler
 metadata:
-  name: {{ template "cloudserver-front.fullname" . }}
+  name: {{ template "cloudserver.fullname" . }}
   labels:
-    app: {{ template "cloudserver-front.name" . }}
+    app: {{ template "cloudserver.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
@@ -12,6 +12,6 @@ spec:
   scaleTargetRef:
     apiVersion: extensions/v1beta1
     kind: Deployment
-    name: {{ template "cloudserver-front.fullname" . }}
+    name: {{ template "cloudserver.fullname" . }}
 {{ toYaml .Values.autoscaling.config | indent 2 }}
 {{- end -}}
diff --git a/charts/cloudserver-front/templates/ingress.yaml b/charts/cloudserver/templates/ingress.yaml
similarity index 83%
rename from charts/cloudserver-front/templates/ingress.yaml
rename to charts/cloudserver/templates/ingress.yaml
index 7d260a94fc..cea65b425e 100644
--- a/charts/cloudserver-front/templates/ingress.yaml
+++ b/charts/cloudserver/templates/ingress.yaml
@@ -1,5 +1,5 @@
 {{- if .Values.ingress.enabled -}}
-{{- $fullName := include "cloudserver-front.fullname" . -}}
+{{- $fullName := include "cloudserver.fullname" . -}}
 {{- $servicePort := .Values.service.port -}}
 {{- $ingressPath := .Values.ingress.path -}}
 apiVersion: extensions/v1beta1
@@ -7,8 +7,8 @@ kind: Ingress
 metadata:
   name: {{ $fullName }}
   labels:
-    app: {{ template "cloudserver-front.name" . }}
-    chart: {{ template "cloudserver-front.chart" . }}
+    app: {{ template "cloudserver.name" . }}
+    chart: {{ template "cloudserver.chart" . }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
 {{- with .Values.ingress.annotations }}
diff --git a/charts/cloudserver-front/templates/manager-deployment.yaml b/charts/cloudserver/templates/manager-deployment.yaml
similarity index 82%
rename from charts/cloudserver-front/templates/manager-deployment.yaml
rename to charts/cloudserver/templates/manager-deployment.yaml
index ec859bc958..e72a166cf6 100644
--- a/charts/cloudserver-front/templates/manager-deployment.yaml
+++ b/charts/cloudserver/templates/manager-deployment.yaml
@@ -2,17 +2,17 @@
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: {{ template "cloudserver-front.fullname" . }}-manager
+  name: {{ template "cloudserver.fullname" . }}-manager
   labels:
-    app: {{ template "cloudserver-front.name" . }}
-    chart: {{ template "cloudserver-front.chart" . }}
+    app: {{ template "cloudserver.name" . }}
+    chart: {{ template "cloudserver.chart" . }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: {{ template "cloudserver-front.name" . }}
+      app: {{ template "cloudserver.name" . }}
       release: {{ .Release.Name }}
   template:
     metadata:
@@ -21,7 +21,7 @@ spec:
         checksum/config: {{ include (print $.Template.BasePath "/certificate.yaml") . | sha256sum }}
         {{- end }}
       labels:
-        app: {{ template "cloudserver-front.name" . }}
+        app: {{ template "cloudserver.name" . }}
         release: {{ .Release.Name }}
     spec:
       containers:
@@ -31,7 +31,7 @@ spec:
           ports:
             - name: http
               containerPort: 8000
-{{ include "cloudserver-front.env" . | indent 10 }}
+{{ include "cloudserver.env" . | indent 10 }}
             - name: MANAGEMENT_MODE
               value: "{{- .Values.orbit.managerMode -}}"
             {{- range $key, $value := .Values.env }}
@@ -67,6 +67,6 @@ spec:
         {{- if .Values.proxy.caCert }}
         - name: proxy-cert
           secret:
-            secretName: {{ template "cloudserver-front.fullname" . }}-proxy
+            secretName: {{ template "cloudserver.fullname" . }}-proxy
         {{- end }}
 {{- end}}
\ No newline at end of file
diff --git a/charts/cloudserver-front/templates/secrets.yaml b/charts/cloudserver/templates/secrets.yaml
similarity index 74%
rename from charts/cloudserver-front/templates/secrets.yaml
rename to charts/cloudserver/templates/secrets.yaml
index 342a72bb1c..35f84c097a 100644
--- a/charts/cloudserver-front/templates/secrets.yaml
+++ b/charts/cloudserver/templates/secrets.yaml
@@ -1,9 +1,9 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ template "cloudserver-front.fullname" . }}
+  name: {{ template "cloudserver.fullname" . }}
   labels:
-    app: {{ template "cloudserver-front.name" . }}
+    app: {{ template "cloudserver.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
diff --git a/charts/cloudserver-front/templates/service.yaml b/charts/cloudserver/templates/service.yaml
similarity index 59%
rename from charts/cloudserver-front/templates/service.yaml
rename to charts/cloudserver/templates/service.yaml
index 643de674a2..ae4d2df157 100644
--- a/charts/cloudserver-front/templates/service.yaml
+++ b/charts/cloudserver/templates/service.yaml
@@ -1,10 +1,10 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ template "cloudserver-front.fullname" . }}
+  name: {{ template "cloudserver.fullname" . }}
   labels:
-    app: {{ template "cloudserver-front.name" . }}
-    chart: {{ template "cloudserver-front.chart" . }}
+    app: {{ template "cloudserver.name" . }}
+    chart: {{ template "cloudserver.chart" . }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
 spec:
@@ -15,5 +15,5 @@ spec:
       protocol: TCP
       name: http
   selector:
-    app: {{ template "cloudserver-front.name" . }}
+    app: {{ template "cloudserver.name" . }}
     release: {{ .Release.Name }}
diff --git a/charts/cloudserver-front/templates/tests/cloudserver-front-test.yaml b/charts/cloudserver/templates/tests/cloudserver-test.yaml
similarity index 76%
rename from charts/cloudserver-front/templates/tests/cloudserver-front-test.yaml
rename to charts/cloudserver/templates/tests/cloudserver-test.yaml
index 87e22d5f87..a4f5f433e3 100644
--- a/charts/cloudserver-front/templates/tests/cloudserver-front-test.yaml
+++ b/charts/cloudserver/templates/tests/cloudserver-test.yaml
@@ -3,12 +3,12 @@
 apiVersion: v1
 kind: Pod
 metadata:
-  name: "{{ .Release.Name }}-cloudserver-front-test"
+  name: "{{ .Release.Name }}-cloudserver-test"
   annotations:
     "helm.sh/hook": test-success
 spec:
   containers:
-  - name: {{ .Release.Name }}-cloudserver-front-test
+  - name: {{ .Release.Name }}-cloudserver-test
     imagePullPolicy: "IfNotPresent"
     image: "docker.io/mesosphere/aws-cli:1.14.5"
     command:
@@ -19,12 +19,12 @@ spec:
       - name: AWS_ACCESS_KEY_ID
         valueFrom:
           secretKeyRef:
-            name: {{ template "cloudserver-front.fullname" . }}
+            name: {{ template "cloudserver.fullname" . }}
             key: keyId
       - name: AWS_SECRET_ACCESS_KEY
         valueFrom:
           secretKeyRef:
-            name: {{ template "cloudserver-front.fullname" . }}
+            name: {{ template "cloudserver.fullname" . }}
             key: secretKey
   restartPolicy: Never
 {{- end }}
diff --git a/charts/cloudserver-front/templates/tests/test-cloudserver-front-service.yml b/charts/cloudserver/templates/tests/test-cloudserver-service.yml
similarity index 74%
rename from charts/cloudserver-front/templates/tests/test-cloudserver-front-service.yml
rename to charts/cloudserver/templates/tests/test-cloudserver-service.yml
index e0b258732b..8ddddb31c8 100644
--- a/charts/cloudserver-front/templates/tests/test-cloudserver-front-service.yml
+++ b/charts/cloudserver/templates/tests/test-cloudserver-service.yml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Pod
 metadata:
-  name: {{ template "cloudserver-front.fullname" . }}-test
+  name: {{ template "cloudserver.fullname" . }}-test
   annotations:
     "helm.sh/hook": test-success
 spec:
@@ -10,7 +10,7 @@ spec:
     image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
     env:
       - name: CLOUDSERVER_FRONT_SERVICE
-        value: "{{ template "cloudserver-front.fullname" . }}"
+        value: "{{ template "cloudserver.fullname" . }}"
     command:
       - sh
       - -c
diff --git a/charts/cloudserver-front/values.yaml b/charts/cloudserver/values.yaml
similarity index 100%
rename from charts/cloudserver-front/values.yaml
rename to charts/cloudserver/values.yaml
diff --git a/charts/gke.md b/charts/gke.md
index 2a7c73c87a..f287129d95 100644
--- a/charts/gke.md
+++ b/charts/gke.md
@@ -85,12 +85,12 @@ instance](../docs/orbit_registration.md):
 
 ```shell
 $ kubectl logs $(kubectl get pods --no-headers=true -o \
-custom-columns=:metadata.name | grep cloudserver-front) | grep \
+custom-columns=:metadata.name | grep cloudserver) | grep \
 Instance | tail -n 1
 ```
 
 The output will look something like this:
 
 ```
-{"name":"S3","time":1529101607249,"req_id":"9089628bad40b9a255fd","level":"info","message":"this deployment's Instance ID is 6075357a-b08d-419e-9af8-cc9f391ca8e2","hostname":"zenko-cloudserver-front-f74d8c48c-dt6fc","pid":23}
+{"name":"S3","time":1529101607249,"req_id":"9089628bad40b9a255fd","level":"info","message":"this deployment's Instance ID is 6075357a-b08d-419e-9af8-cc9f391ca8e2","hostname":"zenko-cloudserver-f74d8c48c-dt6fc","pid":23}
 ```
diff --git a/charts/single-node-values.yml b/charts/single-node-values.yml
index 2a47f8249e..f43d44d845 100644
--- a/charts/single-node-values.yml
+++ b/charts/single-node-values.yml
@@ -5,7 +5,7 @@ ingress:
   hosts:
     - ""
 
-cloudserver-front:
+cloudserver:
   mongodb:
     replicas: *nodeCount
 
diff --git a/charts/zenko/requirements.lock b/charts/zenko/requirements.lock
index e08e3a066a..ce052b8a1d 100644
--- a/charts/zenko/requirements.lock
+++ b/charts/zenko/requirements.lock
@@ -23,8 +23,8 @@ dependencies:
 - name: s3-data
   repository: file://../s3-data
   version: 0.1.0
-- name: cloudserver-front
-  repository: file://../cloudserver-front
+- name: cloudserver
+  repository: file://../cloudserver
   version: 0.1.4
 - name: zenko-nfs
   repository: file://../zenko-nfs
diff --git a/charts/zenko/requirements.yaml b/charts/zenko/requirements.yaml
index 78dce6281b..34e9007510 100644
--- a/charts/zenko/requirements.yaml
+++ b/charts/zenko/requirements.yaml
@@ -28,9 +28,9 @@ dependencies:
 - name: s3-data
   version: "0.1.0"
   repository: "file://../s3-data"
-- name: cloudserver-front
+- name: cloudserver
   version: "0.1.4"
-  repository: "file://../cloudserver-front"
+  repository: "file://../cloudserver"
 - name: zenko-nfs
   version: "0.1.0"
   repository: "file://../zenko-nfs"
diff --git a/charts/zenko/templates/ingress.yaml b/charts/zenko/templates/ingress.yaml
index cb1976cb0e..1cef60e7f2 100644
--- a/charts/zenko/templates/ingress.yaml
+++ b/charts/zenko/templates/ingress.yaml
@@ -1,5 +1,5 @@
 {{- if .Values.ingress.enabled -}}
-{{- $serviceName := printf "%s-%s" .Release.Name "cloudserver-front" | trunc 63 | trimSuffix "-" -}}
+{{- $serviceName := printf "%s-%s" .Release.Name "cloudserver" | trunc 63 | trimSuffix "-" -}}
 apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
diff --git a/charts/zenko/values.yaml b/charts/zenko/values.yaml
index 64b51053fe..c2cd682ec5 100644
--- a/charts/zenko/values.yaml
+++ b/charts/zenko/values.yaml
@@ -10,7 +10,7 @@ nodeCount: &nodeCount 3
 ingress:
   enabled: false
   # Used to create an Ingress record.
-  # This must match the 'cloudserver-front' 'endpoint', unless your client
+  # This must match the 'cloudserver' 'endpoint', unless your client
   # supports different hostnames.
   hosts:
     - zenko.local
@@ -24,7 +24,7 @@ ingress:
     #   hosts:
     #     - zenko.example.com
 
-cloudserver-front:
+cloudserver:
   mongodb:
     replicas: *nodeCount
   orbit: