diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e4bb82ddf854aa0982f5993e80597869227f3730..e292f0cd18cad21b0692359ba29caeb090e079cf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,7 +3,7 @@ include:
     file: '/gitlab-ci/node/kaniko.yml'
 
 variables:
-  INGRESS_HOSTNAME: manifest-$CI_COMMIT_REF_SLUG
+  INGRESS_HOSTNAME: ui-middleware-$CI_COMMIT_REF_SLUG
 
 build image:
   before_script:
@@ -18,7 +18,7 @@ deploy helm chart:
     name: $CI_COMMIT_REF_SLUG
     on_stop: tear down
     auto_stop_in: 1 week
-    url: https://manifest-$CI_COMMIT_REF_SLUG.$KUBE_INGRESS_BASE_DOMAIN
+    url: https://ui-middleware-$CI_COMMIT_REF_SLUG.$KUBE_INGRESS_BASE_DOMAIN
   after_script:
     - envsubst < .gitlab-ci/kubernetes-resources.yaml > tmp-k8s-resources.yaml
     - kubectl apply -f tmp-k8s-resources.yaml
diff --git a/.gitlab-ci/kubernetes-resources.yaml b/.gitlab-ci/kubernetes-resources.yaml
index 69a5ebfabc11de64071e8ddc08c71eac16c4a052..51a09a82a29b4c31cc97347ff31c5a4860c9c581 100644
--- a/.gitlab-ci/kubernetes-resources.yaml
+++ b/.gitlab-ci/kubernetes-resources.yaml
@@ -18,7 +18,7 @@ metadata:
   name: ${OX_COMPONENT}
 spec:
   rules:
-    - host: manifest-${CI_COMMIT_REF_SLUG}.k3s.os2.oxui.de
+    - host: ui-middleware-${CI_COMMIT_REF_SLUG}.k3s.os2.oxui.de
       http:
         paths:
           - path: /
diff --git a/README.md b/README.md
index 5120944383165d51928262352ea62e773e258cbc..0eddaec77ba2031479ac95869683ca2c1d6935f8 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# manifest-service
+# ui-middleware
 
 > Provides the collected manifest.json of services in a cluster as well as a list of dependencies
 > for each source file. This information can be used to dynamically compile all ui components at
@@ -20,18 +20,18 @@
 **docker**
 
 ```
-docker build -t manifest-service .
-docker run -t -i -p 8080:8080 manifest-service
+docker build -t ui-middleware .
+docker run -t -i -p 8080:8080 ui-middleware
 ```
 
 **kubernetes**
 
 ```
 cd helm
-helm upgrade -i -f manifest-service/values.yaml -f values/develop.yaml manifest-service ./manifest-service
+helm upgrade -i -f ui-middleware/values.yaml -f values/develop.yaml ui-middleware ./ui-middleware
 ```
 
-It is possible to horizontally scale the manifest service, as more clients are fetching resources from this service. Each instance maintains a cache of all files locally (in memory), allowing to scale easily.
+It is possible to horizontally scale the UI Middleware, as more clients are fetching resources from this service. Each instance maintains a cache of all files locally (in memory), allowing to scale easily.
 
 ## Configuration
 
@@ -57,4 +57,4 @@ When using Ingress to make the service available to the public, the service is i
 configured as a "fallback" or "default" service to answer all requests that are not specified
 to be served by one of the other services (e.g like everything under /api). This should simplify
 the Ingress configuration. One example can be found
-[in the manifest-service repository](https://gitlab.open-xchange.com/frontend/Infrastructure/manifest-service/-/blob/main/.gitlab-ci/kubernetes-resources.yaml).
+[in the ui-middleware repository](https://gitlab.open-xchange.com/frontend/Infrastructure/ui-middleware/-/blob/main/.gitlab-ci/kubernetes-resources.yaml).
diff --git a/helm/core-manifest-service/templates/_ingress.tpl b/helm/core-manifest-service/templates/_ingress.tpl
deleted file mode 100644
index 8df12d9dd400e0c4d406e26203a8e73fc18b7adc..0000000000000000000000000000000000000000
--- a/helm/core-manifest-service/templates/_ingress.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-{{- define "core-manifest-service.ingressPathMappings" -}}
-paths:
-  - path: /
-{{- end -}}
diff --git a/helm/core-manifest-service/templates/tests/test-connection.yaml b/helm/core-manifest-service/templates/tests/test-connection.yaml
deleted file mode 100644
index 5694c08b9a3e58f83e42abdec9b59a7b75c197b8..0000000000000000000000000000000000000000
--- a/helm/core-manifest-service/templates/tests/test-connection.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-apiVersion: v1
-kind: Pod
-metadata:
-  name: "{{ include "core-manifest-service.fullname" . }}-test-connection"
-  labels:
-    {{- include "core-manifest-service.labels" . | nindent 4 }}
-  annotations:
-    "helm.sh/hook": test
-spec:
-  containers:
-    - name: wget
-      image: busybox
-      command: ['wget']
-      args: ['{{ include "core-manifest-service.fullname" . }}:{{ .Values.service.port }}']
-  restartPolicy: Never
diff --git a/helm/core-manifest-service/.helmignore b/helm/core-ui-middleware/.helmignore
similarity index 100%
rename from helm/core-manifest-service/.helmignore
rename to helm/core-ui-middleware/.helmignore
diff --git a/helm/core-manifest-service/Chart.lock b/helm/core-ui-middleware/Chart.lock
similarity index 100%
rename from helm/core-manifest-service/Chart.lock
rename to helm/core-ui-middleware/Chart.lock
diff --git a/helm/core-manifest-service/Chart.yaml b/helm/core-ui-middleware/Chart.yaml
similarity index 91%
rename from helm/core-manifest-service/Chart.yaml
rename to helm/core-ui-middleware/Chart.yaml
index 117773a232388a0e4e325726739ad80ae4a4cc06..e46a184eca084fe5a4dfbc8ed102922acca7ad86 100644
--- a/helm/core-manifest-service/Chart.yaml
+++ b/helm/core-ui-middleware/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
-name: core-manifest-service
-description: Helm chart for core manifest service
+name: core-ui-middleware
+description: Helm chart for core ui middleware
 
 # A chart can be either an 'application' or a 'library' chart.
 #
@@ -15,13 +15,13 @@ 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: 2.0.5
+version: 1.0.0
 
 # 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.
 # It is recommended to use it with quotes.
-appVersion: "1.1.0"
+appVersion: "1.0.0"
 dependencies:
   - name: ox-common
     version: 1.0.17
diff --git a/helm/core-manifest-service/templates/NOTES.txt b/helm/core-ui-middleware/templates/NOTES.txt
similarity index 75%
rename from helm/core-manifest-service/templates/NOTES.txt
rename to helm/core-ui-middleware/templates/NOTES.txt
index 091f37d970ce662e3c1723e72745f4d0d01c6c47..f08ecd0cc3ef15b48957f17dc673ba920f8d91c2 100644
--- a/helm/core-manifest-service/templates/NOTES.txt
+++ b/helm/core-ui-middleware/templates/NOTES.txt
@@ -6,16 +6,16 @@
   {{- end }}
 {{- end }}
 {{- else if contains "NodePort" .Values.service.type }}
-  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "core-manifest-service.fullname" . }})
+  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "core-ui-middleware.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 --namespace {{ .Release.Namespace }} svc -w {{ include "core-manifest-service.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "core-manifest-service.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
+           You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "core-ui-middleware.fullname" . }}'
+  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "core-ui-middleware.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
   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.kubernetes.io/name={{ include "core-manifest-service.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "core-ui-middleware.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
   export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}")
   echo "Visit http://127.0.0.1:8080 to use your application"
   kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT
diff --git a/helm/core-manifest-service/templates/_helpers.tpl b/helm/core-ui-middleware/templates/_helpers.tpl
similarity index 70%
rename from helm/core-manifest-service/templates/_helpers.tpl
rename to helm/core-ui-middleware/templates/_helpers.tpl
index 81392426ffb0ec239c66af32393d71b35e4ce57e..bb0eb9820f6a31aca0d8435ce4c77283f15f99f7 100644
--- a/helm/core-manifest-service/templates/_helpers.tpl
+++ b/helm/core-ui-middleware/templates/_helpers.tpl
@@ -1,7 +1,7 @@
 {{/*
 Expand the name of the chart.
 */}}
-{{- define "core-manifest-service.name" -}}
+{{- define "core-ui-middleware.name" -}}
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
@@ -10,7 +10,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 "core-manifest-service.fullname" -}}
+{{- define "core-ui-middleware.fullname" -}}
 {{- if .Values.fullnameOverride }}
 {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
 {{- else }}
@@ -26,16 +26,16 @@ 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 "core-manifest-service.chart" -}}
+{{- define "core-ui-middleware.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
 {{/*
 Common labels
 */}}
-{{- define "core-manifest-service.labels" -}}
-helm.sh/chart: {{ include "core-manifest-service.chart" . }}
-{{ include "core-manifest-service.selectorLabels" . }}
+{{- define "core-ui-middleware.labels" -}}
+helm.sh/chart: {{ include "core-ui-middleware.chart" . }}
+{{ include "core-ui-middleware.selectorLabels" . }}
 {{- if .Chart.AppVersion }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
@@ -45,17 +45,17 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{/*
 Selector labels
 */}}
-{{- define "core-manifest-service.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "core-manifest-service.name" . }}
+{{- define "core-ui-middleware.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "core-ui-middleware.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
 
 {{/*
 Create the name of the service account to use
 */}}
-{{- define "core-manifest-service.serviceAccountName" -}}
+{{- define "core-ui-middleware.serviceAccountName" -}}
 {{- if .Values.serviceAccount.create }}
-{{- default (include "core-manifest-service.fullname" .) .Values.serviceAccount.name }}
+{{- default (include "core-ui-middleware.fullname" .) .Values.serviceAccount.name }}
 {{- else }}
 {{- default "default" .Values.serviceAccount.name }}
 {{- end }}
diff --git a/helm/core-ui-middleware/templates/_ingress.tpl b/helm/core-ui-middleware/templates/_ingress.tpl
new file mode 100644
index 0000000000000000000000000000000000000000..3da6a488df581f103fe7e13e7482f846a282f0c1
--- /dev/null
+++ b/helm/core-ui-middleware/templates/_ingress.tpl
@@ -0,0 +1,4 @@
+{{- define "core-ui-middleware.ingressPathMappings" -}}
+paths:
+  - path: /
+{{- end -}}
diff --git a/helm/core-manifest-service/templates/configMap.yaml b/helm/core-ui-middleware/templates/configMap.yaml
similarity index 100%
rename from helm/core-manifest-service/templates/configMap.yaml
rename to helm/core-ui-middleware/templates/configMap.yaml
diff --git a/helm/core-manifest-service/templates/deployment.yaml b/helm/core-ui-middleware/templates/deployment.yaml
similarity index 100%
rename from helm/core-manifest-service/templates/deployment.yaml
rename to helm/core-ui-middleware/templates/deployment.yaml
diff --git a/helm/core-manifest-service/templates/hpa.yaml b/helm/core-ui-middleware/templates/hpa.yaml
similarity index 81%
rename from helm/core-manifest-service/templates/hpa.yaml
rename to helm/core-ui-middleware/templates/hpa.yaml
index 03d4e963033a6ee44e75d1016d420952e378d123..e639743b21f0c3cec9a1a4de560ef25aca5dd2fb 100644
--- a/helm/core-manifest-service/templates/hpa.yaml
+++ b/helm/core-ui-middleware/templates/hpa.yaml
@@ -2,14 +2,14 @@
 apiVersion: autoscaling/v2beta1
 kind: HorizontalPodAutoscaler
 metadata:
-  name: {{ include "core-manifest-service.fullname" . }}
+  name: {{ include "core-ui-middleware.fullname" . }}
   labels:
-    {{- include "core-manifest-service.labels" . | nindent 4 }}
+    {{- include "core-ui-middleware.labels" . | nindent 4 }}
 spec:
   scaleTargetRef:
     apiVersion: apps/v1
     kind: Deployment
-    name: {{ include "core-manifest-service.fullname" . }}
+    name: {{ include "core-ui-middleware.fullname" . }}
   minReplicas: {{ .Values.autoscaling.minReplicas }}
   maxReplicas: {{ .Values.autoscaling.maxReplicas }}
   metrics:
diff --git a/helm/core-manifest-service/templates/ingress.yaml b/helm/core-ui-middleware/templates/ingress.yaml
similarity index 100%
rename from helm/core-manifest-service/templates/ingress.yaml
rename to helm/core-ui-middleware/templates/ingress.yaml
diff --git a/helm/core-manifest-service/templates/service.yaml b/helm/core-ui-middleware/templates/service.yaml
similarity index 100%
rename from helm/core-manifest-service/templates/service.yaml
rename to helm/core-ui-middleware/templates/service.yaml
diff --git a/helm/core-manifest-service/templates/serviceaccount.yaml b/helm/core-ui-middleware/templates/serviceaccount.yaml
similarity index 62%
rename from helm/core-manifest-service/templates/serviceaccount.yaml
rename to helm/core-ui-middleware/templates/serviceaccount.yaml
index 03976829a7ea7399d935709ebadae54394628758..b606f554d0af6af918af98b71882d40104a63ddb 100644
--- a/helm/core-manifest-service/templates/serviceaccount.yaml
+++ b/helm/core-ui-middleware/templates/serviceaccount.yaml
@@ -2,9 +2,9 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{ include "core-manifest-service.serviceAccountName" . }}
+  name: {{ include "core-ui-middleware.serviceAccountName" . }}
   labels:
-    {{- include "core-manifest-service.labels" . | nindent 4 }}
+    {{- include "core-ui-middleware.labels" . | nindent 4 }}
   {{- with .Values.serviceAccount.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
diff --git a/helm/core-ui-middleware/templates/tests/test-connection.yaml b/helm/core-ui-middleware/templates/tests/test-connection.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..0d26cda74b884cea5822d84fe8577ab444b28432
--- /dev/null
+++ b/helm/core-ui-middleware/templates/tests/test-connection.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: "{{ include "core-ui-middleware.fullname" . }}-test-connection"
+  labels:
+    {{- include "core-ui-middleware.labels" . | nindent 4 }}
+  annotations:
+    "helm.sh/hook": test
+spec:
+  containers:
+    - name: wget
+      image: busybox
+      command: ['wget']
+      args: ['{{ include "core-ui-middleware.fullname" . }}:{{ .Values.service.port }}']
+  restartPolicy: Never
diff --git a/helm/core-manifest-service/values.yaml b/helm/core-ui-middleware/values.yaml
similarity index 93%
rename from helm/core-manifest-service/values.yaml
rename to helm/core-ui-middleware/values.yaml
index ff2ea44d732b9683d667c26c9e4cc114c8fd724b..38864178506d856a659a517972962d820c80c63c 100644
--- a/helm/core-manifest-service/values.yaml
+++ b/helm/core-ui-middleware/values.yaml
@@ -1,4 +1,4 @@
-# Default values for core-manifest-service.
+# Default values for core-ui-middleware.
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
@@ -9,7 +9,7 @@ defaultRegistry: registry.open-xchange.com
 containerPort: 8080
 
 image:
-  repository: "core-manifest-service"
+  repository: "core-ui-middleware"
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
   tag: ""
@@ -51,7 +51,7 @@ service:
 
 ingress:
   enabled: true
-  pathMappings: "core-manifest-service.ingressPathMappings"
+  pathMappings: "core-ui-middleware.ingressPathMappings"
   annotations: {}
     # kubernetes.io/ingress.class: nginx
     # kubernetes.io/tls-acme: "true"
diff --git a/helm/values/develop.yaml b/helm/values/develop.yaml
index dd0afd7799d74d2e2a98c6041d71b13f5b8a676f..0108291f05a5f0480babadbbf366676d122c73c8 100644
--- a/helm/values/develop.yaml
+++ b/helm/values/develop.yaml
@@ -1,11 +1,11 @@
 replicaCount: 1
 containerPort: 8080
 baseUrls:
-  - https://manifest-service-dummy.k3s.os.oxui.de/manifest.json
+  - https://ui-middleware-dummy.k3s.os.oxui.de/manifest.json
 ingress:
   enabled: true
   hosts:
-    - host: manifest-${CI_COMMIT_REF_SLUG}.k3s.os.oxui.de
+    - host: ui-middleware-${CI_COMMIT_REF_SLUG}.k3s.os.oxui.de
       paths:
         - path: /
           pathType: ImplementationSpecific
diff --git a/okteto.yml.dist b/okteto.yml.dist
index 80c34eab8129e1ce470fa36a5da141e95f5d8819..b6ffbdbb3af16ff9807a7b490f55f6eaf084f8ec 100644
--- a/okteto.yml.dist
+++ b/okteto.yml.dist
@@ -1,4 +1,4 @@
-name: main-core-manifest-service
+name: main-core-ui-middleware
 image: node:17-alpine
 command: ["sh", "okteto-entrypoint.sh"]
 workdir: /app
diff --git a/package.json b/package.json
index 1ee28d5c750ea48380089e42e49d3b043fea6858..1aaa971670d42b51621aefc8f328c4df33678153 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "manifest-service",
-  "version": "1.1.0",
+  "name": "@open-xchange/ui-middleware",
+  "version": "1.0.0",
   "description": "Provides a combined manifest.json",
   "type": "module",
   "main": "src/index.js",
diff --git a/spec/file-depencies_test.js b/spec/file-depencies_test.js
index f3b4f219f32c9c7fbaf8fce9a142397c5686fce8..e89498893bc9fe28c603985f462d445807b71a55 100644
--- a/spec/file-depencies_test.js
+++ b/spec/file-depencies_test.js
@@ -53,6 +53,6 @@ describe('JS files with dependencies contain events', () => {
     const response = await request(app).get('/index.html.js')
     expect(response.statusCode).toBe(200)
     expect(response.headers.dependencies).toEqual('main.css')
-    expect(response.text).toEqual('console.log("this is index.html.js")\n/*injected by manifest-service*/document.dispatchEvent(new CustomEvent("load-css",{detail:{css:["main.css"]}}))')
+    expect(response.text).toEqual('console.log("this is index.html.js")\n/*injected by ui-middleware*/document.dispatchEvent(new CustomEvent("load-css",{detail:{css:["main.css"]}}))')
   })
 })
diff --git a/spec/meta_test.js b/spec/meta_test.js
index 42b6f1cdfce9f8dc084fc16d67fe5da28252d840..611425cce6c461f4f9970481d82dbd66732527d3 100644
--- a/spec/meta_test.js
+++ b/spec/meta_test.js
@@ -50,8 +50,8 @@ describe('Responses contain custom headers', () => {
     const response = await request(app).get('/meta')
     expect(response.statusCode).toBe(200)
     expect(response.body).toContainEqual({
-      id: 'manifest-service',
-      name: 'Manifest Service',
+      id: 'ui-middleware',
+      name: 'UI Middleware',
       buildDate: '0123456789',
       commitSha: '0123456789abcdef',
       version: '4.2'
diff --git a/spec/server_test.js b/spec/server_test.js
index 662b28bbbfdbabfe36944eb7ce899de99d44bb5c..752856f88fda3bd782432dacc1d8ebae5c8e78bc 100644
--- a/spec/server_test.js
+++ b/spec/server_test.js
@@ -4,7 +4,7 @@ import request from 'supertest'
 import { createApp } from '../src/createApp'
 import { createMockServer, generateSimpleViteManifest, getRandomPort } from './util.js'
 
-describe('Manifest service', () => {
+describe('UI Middleware', () => {
   let app
   let mockserver, mockserver2
   const port = getRandomPort()
diff --git a/src/files.js b/src/files.js
index 529643362419b9bbcf02ce632d4d27ac8b6e0d4f..c264499ce8878bcf6abf7c8aae7348034db28843 100644
--- a/src/files.js
+++ b/src/files.js
@@ -57,7 +57,7 @@ class FileCache {
             let appendix
             if (manifest.css && isJSFile(file)) {
               const cssString = manifest.css.map(file => `"${file}"`).join(',')
-              appendix = `\n/*injected by manifest-service*/document.dispatchEvent(new CustomEvent("load-css",{detail:{css:[${cssString}]}}))`
+              appendix = `\n/*injected by ui-middleware*/document.dispatchEvent(new CustomEvent("load-css",{detail:{css:[${cssString}]}}))`
             }
             return await fetchData(file, manifest.meta.baseUrl, appendix)
           } catch (e) {
diff --git a/src/index.js b/src/index.js
index 7aa62a1199a47a3bbc187c564e2a5a757fa5f07a..5f45f39f9a32d10b39e4be5b3e468762749e9f6f 100644
--- a/src/index.js
+++ b/src/index.js
@@ -12,7 +12,7 @@ const app = createApp()
 
 // Binds and listens for connections on the specified host and port
 root.listen(process.env.PORT, () => {
-  logger.info(`manifest-service listening on port ${process.env.PORT}`)
+  logger.info(`ui-middleware listening on port ${process.env.PORT}`)
 })
 
 process.on('uncaughtException', err => {
diff --git a/src/meta.js b/src/meta.js
index 1cdd7c082153586201ba5bf3a1ca38d02ef5bb20..f14ec34c9febac0a9089237714617118cb9ea280 100644
--- a/src/meta.js
+++ b/src/meta.js
@@ -13,8 +13,8 @@ export async function getMergedMetadata () {
     }
   }))
   metadata.push({
-    id: 'manifest-service',
-    name: 'Manifest Service',
+    id: 'ui-middleware',
+    name: 'UI Middleware',
     buildDate: process.env.BUILD_TIMESTAMP,
     commitSha: process.env.CI_COMMIT_SHA,
     version: process.env.APP_VERSION
diff --git a/src/swagger.yaml b/src/swagger.yaml
index 975d5f4a925ed4b611684e66dbad1d8aa51b79a7..dc6a68c59a743553738d4305f228cf108a223d61 100644
--- a/src/swagger.yaml
+++ b/src/swagger.yaml
@@ -4,7 +4,7 @@ tags:
 servers:
   - url: 'http://localhost:3000'
 info:
-  title: Manifest Service
+  title: UI Middleware
   version: 1.0.0
   description: Micro service that collects manifest files from different services and merge them into a single file
   contact:
@@ -16,7 +16,7 @@ paths:
       tags:
         - code loading
       summary: App Suite UI compatible version of manifests data
-      description: 
+      description:
         Manifest data prepared for consumption by App Suite UI. The data
         can be used to determine the timing when to load certain files
         from the server and depending on the users configuration also if
@@ -66,7 +66,7 @@ paths:
       tags:
         - code loading
       summary: Mapping of all files to all of its dependencies
-      description: 
+      description:
         The data can be used to construct a dependency tree for any given file of a project.
       responses:
         '200':