diff --git a/Jenkinsfile b/Jenkinsfile
index 6e133dff0a018b522073b9c2d4ef2473e1146493..7c178499058d987519a0c06a8ebc33b32d0f5ab4 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -6,7 +6,7 @@ pipeline {
     }
 
     environment {
-        BLUE_OCEAN_URL = "https://jenkins.infra.ozg-cloud.systems/job/antragsraum-server/job/${env.BRANCH_NAME}/${env.BUILD_NUMBER}/"
+        BLUE_OCEAN_URL = "https://jenkins.infra.ozg-cloud.systems/job/antragraum-server/job/${env.BRANCH_NAME}/${env.BUILD_NUMBER}/"
         RELEASE_REGEX = /\d+.\d+.\d+/
         SNAPSHOT_REGEX = /\d+.\d+.\d+-SNAPSHOT/
         FAILED_STAGE = ""
@@ -65,7 +65,7 @@ pipeline {
         }   
 
         
-        stage('Build Antragsraum-Server') {
+        stage('Build Antragraum-Server') {
           steps {
                 script {
                     FAILED_STAGE=env.STAGE_NAME
@@ -222,10 +222,10 @@ pipeline {
 Void deployHelmChart(String helmChartVersion) {       
     withCredentials([usernamePassword(credentialsId: 'jenkins-nexus-login', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]){
         if (env.BRANCH_NAME == 'release') {
-            result = sh script: '''curl -u $USERNAME:$PASSWORD https://nexus.ozg-sh.de/service/rest/v1/components?repository=ozg-base-apps -F file=@antragsraum-server-'''+helmChartVersion+'''.tgz''', returnStdout: true
+            result = sh script: '''curl -u $USERNAME:$PASSWORD https://nexus.ozg-sh.de/service/rest/v1/components?repository=ozg-base-apps -F file=@antragraum-server-'''+helmChartVersion+'''.tgz''', returnStdout: true
         }
         else {
-            result = sh script: '''curl -u $USERNAME:$PASSWORD https://nexus.ozg-sh.de/service/rest/v1/components?repository=ozg-base-apps-snapshot -F file=@antragsraum-server-'''+helmChartVersion+'''.tgz''', returnStdout: true
+            result = sh script: '''curl -u $USERNAME:$PASSWORD https://nexus.ozg-sh.de/service/rest/v1/components?repository=ozg-base-apps-snapshot -F file=@antragraum-server-'''+helmChartVersion+'''.tgz''', returnStdout: true
         }
 
         if (result != '') {
@@ -251,8 +251,8 @@ Void tagAndPushDockerImage(String newTag){
     withCredentials([usernamePassword(credentialsId: 'jenkins-nexus-login', usernameVariable: 'USER', passwordVariable: 'PASSWORD')]) {
         sh 'docker login docker.ozg-sh.de -u ${USER} -p ${PASSWORD}'
 
-        sh "docker tag docker.ozg-sh.de/antragsraum-server:build-latest docker.ozg-sh.de/antragsraum-server:${newTag}"
-        sh "docker push docker.ozg-sh.de/antragsraum-server:${newTag}"
+        sh "docker tag docker.ozg-sh.de/antragraum-server:build-latest docker.ozg-sh.de/antragraum-server:${newTag}"
+        sh "docker push docker.ozg-sh.de/antragraum-server:${newTag}"
     }
 }
 
@@ -300,12 +300,12 @@ Void setNewTestVersion() {
 
 Void setNewGitopsVersion(String environment) {
     dir("gitops") {
-        def envFile = "${environment}/application/values/antragsraum-server-values.yaml"
+        def envFile = "${environment}/application/values/antragraum-server-values.yaml"
 
         def envVersions = readYaml file: envFile
 
-        envVersions.antragsraum_server.image.tag = IMAGE_TAG
-        envVersions.antragsraum_server.helm.version = HELM_CHART_VERSION
+        envVersions.antragraum_server.image.tag = IMAGE_TAG
+        envVersions.antragraum_server.helm.version = HELM_CHART_VERSION
 
         writeYaml file: envFile, data: envVersions, overwrite: true
     }
@@ -326,24 +326,24 @@ Void pushNewGitopsVersion(String environment) {
         }
 
         withCredentials([usernamePassword(credentialsId: 'jenkins-gitea-access-token', passwordVariable: 'TOKEN', usernameVariable: 'USER')]) {
-            sh "git add ${environment}/application/values/antragsraum-server-values.yaml"
+            sh "git add ${environment}/application/values/antragraum-server-values.yaml"
 
-            sh "git commit -m 'jenkins rollout ${environment} antragsraum-server version ${IMAGE_TAG}'"
+            sh "git commit -m 'jenkins rollout ${environment} antragraum-server version ${IMAGE_TAG}'"
             sh 'git push https://${USER}:${TOKEN}@git.ozg-sh.de/ozgcloud-devops/gitops.git'
         }
     }
 }
 
 Boolean hasValuesFileChanged(String environment) {
-    return sh (script: "git status | grep '${environment}/application/values/antragsraum-server-values.yaml'", returnStatus: true) == env.SH_SUCCESS_STATUS_CODE as Integer
+    return sh (script: "git status | grep '${environment}/application/values/antragraum-server-values.yaml'", returnStatus: true) == env.SH_SUCCESS_STATUS_CODE as Integer
 }
 
 Void sendFailureMessage() {
     def room = ''
     def data = """{"msgtype":"m.text", \
-                    "body":"AntragsraumServer: Build Failed. Stage: ${FAILED_STAGE} Build-ID: ${env.BUILD_NUMBER} Link: ${BLUE_OCEAN_URL}", \
+                    "body":"AntragraumServer: Build Failed. Stage: ${FAILED_STAGE} Build-ID: ${env.BUILD_NUMBER} Link: ${BLUE_OCEAN_URL}", \
                     "format": "org.matrix.custom.html", \
-                    "formatted_body":"AntragsraumServer: Build Failed. Stage: ${FAILED_STAGE} Build-ID: <a href='${BLUE_OCEAN_URL}'>${env.BUILD_NUMBER}</a>"}"""
+                    "formatted_body":"AntragraumServer: Build Failed. Stage: ${FAILED_STAGE} Build-ID: <a href='${BLUE_OCEAN_URL}'>${env.BUILD_NUMBER}</a>"}"""
        
     if (env.BRANCH_NAME == 'master') {
         room = "!iQPAvQIiRwRpNOszjw:matrix.ozg-sh.de"
diff --git a/server/pom.xml b/server/pom.xml
index 5f0306eeda37678c88bc43e6df27c8ff1d345e67..a5aaeb77ff6884f1b9323aa1674bd409671234ef 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -40,7 +40,7 @@
 		<java.version>21</java.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-		<spring-boot.build-image.imageName>docker.ozg-sh.de/antragsraum-server:build-latest
+		<spring-boot.build-image.imageName>docker.ozg-sh.de/antragraum-server:build-latest
 		</spring-boot.build-image.imageName>
 
 		<maven-deploy-plugin.version>3.0.0</maven-deploy-plugin.version>
diff --git a/server/src/main/helm/Chart.yaml b/server/src/main/helm/Chart.yaml
index 52162d593ad8fc50b28e78628fd1ca6287645502..1833a1c2dc323713d054a02d1278dba856193b01 100644
--- a/server/src/main/helm/Chart.yaml
+++ b/server/src/main/helm/Chart.yaml
@@ -24,7 +24,7 @@
 
 apiVersion: v1
 appVersion: "1.0"
-description: A Helm chart for Antragsraum-Server
-name: antragsraum-server
+description: A Helm chart for Antragraum-Server
+name: antragraum-server
 version: 0.0.0-MANAGED-BY-JENKINS
 icon: https://simpleicons.org/icons/helm.svg
diff --git a/server/src/main/helm/templates/_helpers.tpl b/server/src/main/helm/templates/_helpers.tpl
index 17379871784f849fef1ec25f769bfed22700537b..3bbea2e796a0974ea062015ebc7238a328a99190 100644
--- a/server/src/main/helm/templates/_helpers.tpl
+++ b/server/src/main/helm/templates/_helpers.tpl
@@ -27,7 +27,7 @@
 
 {{/* Default Labels: Helm recommended best-practice labels https://helm.sh/docs/chart_best_practices/labels/ */}}
 {{- define "app.defaultLabels" }}
-app.kubernetes.io/instance: antragsraum-server
+app.kubernetes.io/instance: antragraum-server
 app.kubernetes.io/managed-by: {{ include "app.managedBy" . }}
 app.kubernetes.io/name: {{ .Release.Name }}
 app.kubernetes.io/namespace: {{ include "app.namespace" . }}
@@ -42,7 +42,7 @@ app.kubernetes.io/namespace: {{ include "app.namespace" . }}
 {{- end -}}
 
 {{- define "app.serviceAccountName" -}}
-{{ printf "%s" ( (.Values.serviceAccount).name | default "antragsraum-server-service-account" ) }}
+{{ printf "%s" ( (.Values.serviceAccount).name | default "antragraum-server-service-account" ) }}
 {{- end -}}
 
 {{- define "app.baseDomain" -}}
diff --git a/server/src/main/helm/templates/create_jwt_secret_network_policy.yaml b/server/src/main/helm/templates/create_jwt_secret_network_policy.yaml
index 4c2f801a7f8f463da30eacc1d31a9e937ae6d548..7111d5428a7089f2c1a717abbeeefe1c0f27aab4 100644
--- a/server/src/main/helm/templates/create_jwt_secret_network_policy.yaml
+++ b/server/src/main/helm/templates/create_jwt_secret_network_policy.yaml
@@ -25,12 +25,12 @@
 apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
 metadata:
-  name: network-policy-create-antragsraum-jwt-secret
+  name: network-policy-create-antragraum-jwt-secret
   namespace: {{ .Release.Namespace }} 
 spec:
   podSelector:
     matchLabels:
-      component: create-antragsraum-jwt-secret
+      component: create-antragraum-jwt-secret
   policyTypes:
   - Egress
   egress:
diff --git a/server/src/main/helm/templates/create_jwt_secret_rbac.yaml b/server/src/main/helm/templates/create_jwt_secret_rbac.yaml
index a211f59093e3164d15718982a67ebbf75946093e..06d988095ad3b9977640ce8e4b83540eae7b8669 100644
--- a/server/src/main/helm/templates/create_jwt_secret_rbac.yaml
+++ b/server/src/main/helm/templates/create_jwt_secret_rbac.yaml
@@ -25,26 +25,26 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: create-antragsraum-jwt-secret-service-account
+  name: create-antragraum-jwt-secret-service-account
   namespace: {{ .Release.Namespace }}
 ---
 kind: RoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: create-antragsraum-jwt-secret-role-binding
+  name: create-antragraum-jwt-secret-role-binding
   namespace: {{ .Release.Namespace }}
 subjects:
   - kind: ServiceAccount
-    name: create-antragsraum-jwt-secret-service-account
+    name: create-antragraum-jwt-secret-service-account
 roleRef:
   kind: Role
-  name: create-antragsraum-jwt-secret-role
+  name: create-antragraum-jwt-secret-role
   apiGroup: rbac.authorization.k8s.io
 ---
 kind: Role
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: create-antragsraum-jwt-secret-role
+  name: create-antragraum-jwt-secret-role
   namespace: {{ .Release.Namespace }}
 rules:
   - apiGroups:
diff --git a/server/src/main/helm/templates/create_jwt_secret_script_configmap.yaml b/server/src/main/helm/templates/create_jwt_secret_script_configmap.yaml
index e6cfce626e2af3217cd2f18a708e1fe634a27ff0..ce0698214541e6dd9321827ad4b8f70b8ee38f02 100644
--- a/server/src/main/helm/templates/create_jwt_secret_script_configmap.yaml
+++ b/server/src/main/helm/templates/create_jwt_secret_script_configmap.yaml
@@ -26,27 +26,27 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: create-antragsraum-jwt-secret-script
+  name: create-antragraum-jwt-secret-script
   namespace: {{ .Release.Namespace }}
 data:
-  create-antragsraum-jwt-secret.sh: |
+  create-antragraum-jwt-secret.sh: |
     #!/bin/sh
     
     kubectl get secrets -n {{ .Release.Namespace }} -o json >> /tmp/secrets.json
     
     jq '.items[] | .metadata.name' /tmp/secrets.json
   
-    secretName="antragsraum-jwt-secret"
+    secretName="antragraum-jwt-secret"
 
-    antragsraumJWTSecretExists=$(jq -e ".items[] | select(.metadata.name == \"$secretName\")" /tmp/secrets.json > /dev/null ; echo "$?")
+    antragraumJWTSecretExists=$(jq -e ".items[] | select(.metadata.name == \"$secretName\")" /tmp/secrets.json > /dev/null ; echo "$?")
    
-    echo "$secretName status: $antragsraumJWTSecretExists"
+    echo "$secretName status: $antragraumJWTSecretExists"
 
-    if [ "$antragsraumJWTSecretExists" -ne 0 ]
+    if [ "$antragraumJWTSecretExists" -ne 0 ]
     then
       echo "Erstelle neues Secret: $secretName"
       kubectl create secret generic $secretName --namespace={{ .Release.Namespace }} --from-literal="jwt-secret=$(openssl rand -base64 72)"
     else
-      echo "Kein neues Secret für antragsraum jwt"
+      echo "Kein neues Secret für antragraum jwt"
     fi
   
\ No newline at end of file
diff --git a/server/src/main/helm/templates/create_secret_pod.yaml b/server/src/main/helm/templates/create_secret_pod.yaml
index 1ff83e7a41b0c09c2249017523b417e3ed5183bc..a9cc317d3e1d784729912c4805b071cb29a4a954 100644
--- a/server/src/main/helm/templates/create_secret_pod.yaml
+++ b/server/src/main/helm/templates/create_secret_pod.yaml
@@ -25,25 +25,25 @@
 apiVersion: v1
 kind: Pod
 metadata:
-  name: create-antragsraum-jwt-secret
+  name: create-antragraum-jwt-secret
   namespace: {{ .Release.Namespace }}
   labels:
-    component: create-antragsraum-jwt-secret
+    component: create-antragraum-jwt-secret
 spec:
-  serviceAccountName: create-antragsraum-jwt-secret-service-account
+  serviceAccountName: create-antragraum-jwt-secret-service-account
   restartPolicy: Never
   containers:
-    - name: create-antragsraum-jwt-secret
+    - name: create-antragraum-jwt-secret
       image: "{{ .Values.image.kubectl.repo }}/{{ .Values.image.kubectl.name }}:{{ .Values.image.kubectl.tag }}"
-      command: ["/bin/sh", "-c", "./script/create-antragsraum-jwt-secret.sh"]
+      command: ["/bin/sh", "-c", "./script/create-antragraum-jwt-secret.sh"]
       volumeMounts:
         - mountPath: "/script"
-          name: create-antragsraum-jwt-secret-volume
+          name: create-antragraum-jwt-secret-volume
   volumes:
-    - name: create-antragsraum-jwt-secret-volume
+    - name: create-antragraum-jwt-secret-volume
       configMap:
         defaultMode: 493
-        name: create-antragsraum-jwt-secret-script
+        name: create-antragraum-jwt-secret-script
 {{- if .Values.imagePullSecret }}
   imagePullSecrets:
   - name: {{ .Values.imagePullSecret }}
diff --git a/server/src/main/helm/templates/deployment.yaml b/server/src/main/helm/templates/deployment.yaml
index ca326aa2039978760ed215c82dd2512464be2db6..ec9233000189dec57d1434c8b0957c48f7a69858 100644
--- a/server/src/main/helm/templates/deployment.yaml
+++ b/server/src/main/helm/templates/deployment.yaml
@@ -44,7 +44,7 @@ spec:
     metadata:
       labels:
         {{- include "app.defaultLabels" . | indent 8 }}
-        component: antragsraum-server
+        component: antragraum-server
     spec:
       {{- if (.Values.serviceAccount).create }}
       serviceAccountName: {{ include "app.serviceAccountName" . }}
@@ -62,7 +62,7 @@ spec:
         - name:  {{ required "imagePullSecret must be set" .Values.imagePullSecret }}
       restartPolicy: Always
       containers:
-      - name: antragsraum-server
+      - name: antragraum-server
         image: "{{ .Values.image.repo }}/{{ .Values.image.name }}:{{ coalesce (.Values.image).tag "latest" }}"
         imagePullPolicy: Always
         ports:
@@ -98,12 +98,12 @@ spec:
 
       
         - name: OZGCLOUD_ANTRAGSRAUM_LOGOUTSUCCESSURL
-          value: {{ required ".Values.antragsraum.logoutSuccessUrl must be set" (.Values.antragsraum).logoutSuccessUrl }}
+          value: {{ required ".Values.antragraum.logoutSuccessUrl must be set" (.Values.antragraum).logoutSuccessUrl }}
 
         - name: OZGCLOUD_ANTRAGSRAUM_NACHRICHT-PROXY_BASE-URL
-          value: {{ required ".Values.antragsraum.antragraumProxyUrl must be set" (.Values.antragsraum).antragraumProxyUrl }}
+          value: {{ required ".Values.antragraum.antragraumProxyUrl must be set" (.Values.antragraum).antragraumProxyUrl }}
         - name: OZGCLOUD_ANTRAGSRAUM_INFOMANAGER-PROXY_BASE-URL
-          value: {{ required ".Values.antragsraum.infomanagerProxyUrl must be set" (.Values.antragsraum).infomanagerProxyUrl }}
+          value: {{ required ".Values.antragraum.infomanagerProxyUrl must be set" (.Values.antragraum).infomanagerProxyUrl }}
 
         - name: SPRING_SECURITY_SAML2_RELYINGPARTY_REGISTRATION_BAYERNID_SIGNING_CREDENTIALS_0_PRIVATE-KEY-LOCATION
           value: file:///keystore/signing.key
@@ -119,19 +119,19 @@ spec:
           value: file:///metadata/bayernid-idp-infra.xml
 
         - name: SPRING_SECURITY_SAML2_RELYINGPARTY_REGISTRATION_BAYERNID_ENTITY-ID
-          value: {{ required ".Values.antragsraum.saml.entityID must be set" .Values.antragsraum.saml.entityID }}
+          value: {{ required ".Values.antragraum.saml.entityID must be set" .Values.antragraum.saml.entityID }}
 
         - name: SPRING_SERVLET_MULTIPART_MAX-FILE-SIZE
-          value: {{.Values.antragsraum.servlet.maxFileSize }}
+          value: {{((.Values.antragraum).servlet).maxFileSize }}
         - name: SPRING_SERVLET_MULTIPART_MAX-REQUEST-SIZE
-          value: {{.Values.antragsraum.servlet.maxRequestSize }}
+          value: {{((.Values.antragraum).servlet).maxRequestSize }}
         - name: SERVER_TOMCAT_MAX-SWALLOW-SIZE
-          value: {{((.Values.antragsraum).tomcat).maxSwallowSize }}
+          value: {{((.Values.antragraum).tomcat).maxSwallowSize }}
 
         - name: OZGCLOUD_JWT_SECRET
           valueFrom:
             secretKeyRef:
-             name: antragsraum-jwt-secret
+             name: antragraum-jwt-secret
              key: jwt-secret
              optional: false
 
@@ -161,7 +161,7 @@ spec:
         terminationMessagePolicy: File
         tty: true
         volumeMounts:
-          - mountPath: /tmp/antragsraum
+          - mountPath: /tmp/antragraum
             name: tmp-volume
           - name: saml-mount
             mountPath: "/keystore/signing.crt"
diff --git a/server/src/main/helm/templates/network_policy.yaml b/server/src/main/helm/templates/network_policy.yaml
index 21e2e64239c425d1e0b8dd49650b0231a9a82457..54fe9c07dcf5a4ac36a9e81314973b5da951d99e 100644
--- a/server/src/main/helm/templates/network_policy.yaml
+++ b/server/src/main/helm/templates/network_policy.yaml
@@ -25,12 +25,12 @@
 apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
 metadata:
-  name: network-policy-antragsraum-server
+  name: network-policy-antragraum-server
   namespace: {{ .Release.Namespace }}
 spec:
   podSelector:
     matchLabels:
-      component: antragsraum-server
+      component: antragraum-server
   policyTypes:
     - Ingress
     - Egress
diff --git a/server/src/main/helm/templates/service.yaml b/server/src/main/helm/templates/service.yaml
index ec95038dd62f99ff45e096add565d81e0e086ed1..fdf8610ee7f881e5e95890224b319f7cf8351f57 100644
--- a/server/src/main/helm/templates/service.yaml
+++ b/server/src/main/helm/templates/service.yaml
@@ -28,11 +28,11 @@ metadata:
   namespace: {{ include "app.namespace" . }}
   labels:
     {{- include "app.defaultLabels" . | indent 4 }}
-    component: antragsraum-server-service
+    component: antragraum-server-service
 spec:
   selector:
     {{- include "app.matchLabels" . | indent 4 }}
-    component: antragsraum-server
+    component: antragraum-server
   ports:
     - name: http
       protocol: TCP
diff --git a/server/src/main/helm/values.yaml b/server/src/main/helm/values.yaml
index 23d4e2ab7fcaffadbd30ee119deef37d79862846..0714ed1cfdaeea1e3cb77b7da2c00225cae9814f 100644
--- a/server/src/main/helm/values.yaml
+++ b/server/src/main/helm/values.yaml
@@ -24,7 +24,7 @@
 
 image:
   repo: docker.ozg-sh.de
-  name: antragsraum-server
+  name: antragraum-server
   tag: latest
   kubectl:
     repo: dockerproxy.ozg-sh.de
@@ -32,7 +32,7 @@ image:
     tag: latest
 replicaCount: 1
 
-antragsraum:
+antragraum:
   servlet:
     maxRequestSize: 50MB
     maxFileSize: 30MB
diff --git a/server/src/test/helm-linter-values.yaml b/server/src/test/helm-linter-values.yaml
index 8f05ad82304b80d795c79a50ba87b077ebd15d07..7d347b8a100976316f2d0e486785c00f15077e11 100644
--- a/server/src/test/helm-linter-values.yaml
+++ b/server/src/test/helm-linter-values.yaml
@@ -36,9 +36,9 @@ grpcclient:
   infomanager:
     address: "static://info-manager:9090"
     negotiationtype: PLAINTEXT
-antragsraum:
+antragraum:
   logoutSuccessUrl: https://test.antragsraum.de/?logout
-  antragraumProxyUrl: https://test.antragsraumproxy.de
+  antragraumProxyUrl: https://test.antragraumproxy.de
   infomanagerProxyUrl: https://test.infomanagerraumproxy.de
   saml:
     entityID: https://sso.dev.de/realms/by-antragsraum-idp
diff --git a/server/src/test/helm/create_jwt_secret_network_policy_test.yaml b/server/src/test/helm/create_jwt_secret_network_policy_test.yaml
index 552134a889ff47a8ed8655857298c44f0e99d0d4..a60b5e5ef90373ab2f40a11ac175868a15cf58f5 100644
--- a/server/src/test/helm/create_jwt_secret_network_policy_test.yaml
+++ b/server/src/test/helm/create_jwt_secret_network_policy_test.yaml
@@ -24,7 +24,7 @@
 
 suite: network policy test
 release:
-  name: network-policy-create-antragsraum-jwt-secret
+  name: network-policy-create-antragraum-jwt-secret
   namespace: by-helm-test
 templates:
   - templates/create_jwt_secret_network_policy.yaml
@@ -42,7 +42,7 @@ tests:
       - equal:
           path: metadata
           value:
-            name: network-policy-create-antragsraum-jwt-secret
+            name: network-policy-create-antragraum-jwt-secret
             namespace: by-helm-test
   - it: validate spec
     asserts:
@@ -51,7 +51,7 @@ tests:
           value:
             podSelector:
               matchLabels:
-                component: create-antragsraum-jwt-secret
+                component: create-antragraum-jwt-secret
             policyTypes:
             - Egress
             egress:
diff --git a/server/src/test/helm/create_jwt_secret_rbac_test.yaml b/server/src/test/helm/create_jwt_secret_rbac_test.yaml
index ed973f899b8da1c838bc8e6ddc697f442a693ff6..8a17c1545072151926b2e28ee7dcf7b18a2ee77a 100644
--- a/server/src/test/helm/create_jwt_secret_rbac_test.yaml
+++ b/server/src/test/helm/create_jwt_secret_rbac_test.yaml
@@ -35,7 +35,7 @@ tests:
         documentIndex: 0
       - equal:
           path: metadata.name
-          value: create-antragsraum-jwt-secret-service-account
+          value: create-antragraum-jwt-secret-service-account
         documentIndex: 0
       - equal:
           path: metadata.namespace
@@ -48,7 +48,7 @@ tests:
         documentIndex: 1
       - equal:
           path: metadata.name
-          value: create-antragsraum-jwt-secret-role-binding
+          value: create-antragraum-jwt-secret-role-binding
         documentIndex: 1
       - equal:
           path: metadata.namespace
@@ -58,7 +58,7 @@ tests:
           path: subjects
           content:
             kind: ServiceAccount
-            name: create-antragsraum-jwt-secret-service-account
+            name: create-antragraum-jwt-secret-service-account
         documentIndex: 1
       - equal:
           path: roleRef.kind
@@ -66,7 +66,7 @@ tests:
         documentIndex: 1
       - equal:
           path: roleRef.name
-          value: create-antragsraum-jwt-secret-role
+          value: create-antragraum-jwt-secret-role
         documentIndex: 1
       - equal:
           path: roleRef.apiGroup
@@ -79,7 +79,7 @@ tests:
         documentIndex: 2
       - equal:
           path: metadata.name
-          value: create-antragsraum-jwt-secret-role
+          value: create-antragraum-jwt-secret-role
         documentIndex: 2
       - equal:
           path: metadata.namespace
diff --git a/server/src/test/helm/create_jwt_secret_script_configmap_test.yaml b/server/src/test/helm/create_jwt_secret_script_configmap_test.yaml
index 1cbfe200049ea627f3586cbae244c1ab1e37e5a1..46a9fae9043e21c55106dc32a4e12fa999cbd0bb 100644
--- a/server/src/test/helm/create_jwt_secret_script_configmap_test.yaml
+++ b/server/src/test/helm/create_jwt_secret_script_configmap_test.yaml
@@ -34,7 +34,7 @@ tests:
           of: ConfigMap
       - equal:
           path: metadata.name
-          value: create-antragsraum-jwt-secret-script
+          value: create-antragraum-jwt-secret-script
       - equal:
           path: metadata.namespace
           value: by-helm-test
@@ -43,25 +43,25 @@ tests:
       - equal:
           path: data
           value:
-             create-antragsraum-jwt-secret.sh: |
+             create-antragraum-jwt-secret.sh: |
                 #!/bin/sh
 
                 kubectl get secrets -n by-helm-test -o json >> /tmp/secrets.json
 
                 jq '.items[] | .metadata.name' /tmp/secrets.json
 
-                secretName="antragsraum-jwt-secret"
+                secretName="antragraum-jwt-secret"
 
-                antragsraumJWTSecretExists=$(jq -e ".items[] | select(.metadata.name == \"$secretName\")" /tmp/secrets.json > /dev/null ; echo "$?")
+                antragraumJWTSecretExists=$(jq -e ".items[] | select(.metadata.name == \"$secretName\")" /tmp/secrets.json > /dev/null ; echo "$?")
 
-                echo "$secretName status: $antragsraumJWTSecretExists"
+                echo "$secretName status: $antragraumJWTSecretExists"
 
-                if [ "$antragsraumJWTSecretExists" -ne 0 ]
+                if [ "$antragraumJWTSecretExists" -ne 0 ]
                 then
                   echo "Erstelle neues Secret: $secretName"
                   kubectl create secret generic $secretName --namespace=by-helm-test --from-literal="jwt-secret=$(openssl rand -base64 72)"
                 else
-                  echo "Kein neues Secret für antragsraum jwt"
+                  echo "Kein neues Secret für antragraum jwt"
                 fi
 
  
diff --git a/server/src/test/helm/create_secret_pod_test.yaml b/server/src/test/helm/create_secret_pod_test.yaml
index 1c83a7c2cd5f2cf15a4e350ecc72315c7ed8f2a1..d32aaaf61dfbd538cce410e62ccb409e13f06189 100644
--- a/server/src/test/helm/create_secret_pod_test.yaml
+++ b/server/src/test/helm/create_secret_pod_test.yaml
@@ -35,40 +35,40 @@ tests:
           of: Pod
       - equal:
           path: metadata.name
-          value: "create-antragsraum-jwt-secret"
+          value: "create-antragraum-jwt-secret"
       - equal:
           path: metadata.namespace
           value: "by-helm-test"
       - equal:
           path: metadata.labels.component
-          value: create-antragsraum-jwt-secret
+          value: create-antragraum-jwt-secret
       - equal:
           path: spec.serviceAccountName
-          value: "create-antragsraum-jwt-secret-service-account"
+          value: "create-antragraum-jwt-secret-service-account"
       - equal:
           path: spec.restartPolicy
           value: "Never"
       - equal:
           path: spec.containers[0].name
-          value: create-antragsraum-jwt-secret
+          value: create-antragraum-jwt-secret
       - equal:
           path: spec.containers[0].image
           value: dockerproxy.ozg-sh.de/bitnami/kubectl:latest
       - equal:
           path: spec.containers[0].command
-          value: ["/bin/sh", "-c", "./script/create-antragsraum-jwt-secret.sh"]
+          value: ["/bin/sh", "-c", "./script/create-antragraum-jwt-secret.sh"]
       - contains:
           path: spec.containers[0].volumeMounts
           content:
             mountPath: "/script"
-            name: "create-antragsraum-jwt-secret-volume"
+            name: "create-antragraum-jwt-secret-volume"
       - contains:
           path: spec.volumes
           content:
-            name: "create-antragsraum-jwt-secret-volume"
+            name: "create-antragraum-jwt-secret-volume"
             configMap:
               defaultMode: 493
-              name: create-antragsraum-jwt-secret-script
+              name: create-antragraum-jwt-secret-script
       - notExists:
           path: spec.imagePullSecrets
 
diff --git a/server/src/test/helm/deployment_63_char_test.yaml b/server/src/test/helm/deployment_63_char_test.yaml
index aa188c0e43808c7e642f0e5b91008eaab0ec2c2b..54141a0a6e657b22f758631cf937340987d64c2e 100644
--- a/server/src/test/helm/deployment_63_char_test.yaml
+++ b/server/src/test/helm/deployment_63_char_test.yaml
@@ -24,7 +24,7 @@
 
 suite: test deyploment less than 63 chars
 release:
-  name: antragsraum-server
+  name: antragraum-server
   namespace: sh-helm-test
 
 templates:
@@ -33,12 +33,12 @@ set:
   ozgcloud:
     environment: test
   imagePullSecret: test-image-secret
-  antragsraum:
+  antragraum:
     logoutSuccessUrl: https://test.antragsraum.de/?logout
-    antragraumProxyUrl: https://test.antragsraumproxy.de
+    antragraumProxyUrl: https://test.antragraumproxy.de
     infomanagerProxyUrl: https://test.infomanagerraumproxy.de
     saml:
-      entityID: https://sso.dev.de/realms/by-antragsraum-idp
+      entityID: https://sso.dev.de/realms/by-antragraum-idp
   samlRegistrationSecretName: bayernid-saml-registration-secret
 
 
@@ -57,7 +57,7 @@ tests:
       version: 1.0-test1234567890123123456789012345678901234567890123456789012345678901234567890123456789012345678904567890
     asserts:
       - failedTemplate:
-          errorMessage: .Chart.Name-.Chart.Version antragsraum-server-1.0-test1234567890123123456789012345678901234567890123456789012345678901234567890123456789012345678904567890 ist zu lang (max. 63 Zeichen)
+          errorMessage: .Chart.Name-.Chart.Version antragraum-server-1.0-test1234567890123123456789012345678901234567890123456789012345678901234567890123456789012345678904567890 ist zu lang (max. 63 Zeichen)
   - it: should not fail on .Chart.Name-.Chart.Version length less than 63 characters
     asserts:
       - notFailedTemplate: {}
\ No newline at end of file
diff --git a/server/src/test/helm/deployment_actuator_test.yaml b/server/src/test/helm/deployment_actuator_test.yaml
index c17317e1d8cfb8cd46e56153d135238487c52511..3220d481c77c970d8c05d8e169b90714e3559643 100644
--- a/server/src/test/helm/deployment_actuator_test.yaml
+++ b/server/src/test/helm/deployment_actuator_test.yaml
@@ -24,7 +24,7 @@
 
 suite: test deployment actuator 
 release:
-  name: antragsraum-server
+  name: antragraum-server
   namespace: sh-helm-test
 templates:
   - templates/deployment.yaml
@@ -32,12 +32,12 @@ set:
   ozgcloud:
     environment: dev
   imagePullSecret: test-image-secret
-  antragsraum:
+  antragraum:
     logoutSuccessUrl: https://test.antragsraum.de/?logout
-    antragraumProxyUrl: https://test.antragsraumproxy.de
+    antragraumProxyUrl: https://test.antragraumproxy.de
     infomanagerProxyUrl: https://test.infomanagerraumproxy.de
     saml:
-      entityID: https://sso.dev.de/realms/by-antragsraum-idp
+      entityID: https://sso.dev.de/realms/by-antragraum-idp
   samlRegistrationSecretName: bayernid-saml-registration-secret
 
 tests:
diff --git a/server/src/test/helm/deployment_bindings_test.yaml b/server/src/test/helm/deployment_bindings_test.yaml
index 0e4b614e0f5a6b5c29af1f92d158a5858a8ca9d7..edbf4233af4f8ee6f25aa3b1b69446231cbe461e 100644
--- a/server/src/test/helm/deployment_bindings_test.yaml
+++ b/server/src/test/helm/deployment_bindings_test.yaml
@@ -22,9 +22,9 @@
 # unter der Lizenz sind dem Lizenztext zu entnehmen.
 #
 
-suite: deployment antragsraum-server bindings
+suite: deployment antragraum-server bindings
 release:
-  name: antragsraum-server
+  name: antragraum-server
   namespace: sh-helm-test
 templates:
   - templates/deployment.yaml
@@ -32,12 +32,12 @@ set:
   ozgcloud:
     environment: dev
   imagePullSecret: test-image-secret
-  antragsraum:
+  antragraum:
     logoutSuccessUrl: https://test.antragsraum.de/?logout
-    antragraumProxyUrl: https://test.antragsraumproxy.de
+    antragraumProxyUrl: https://test.antragraumproxy.de
     infomanagerProxyUrl: https://test.infomanagerraumproxy.de
     saml:
-      entityID: https://sso.dev.de/realms/by-antragsraum-idp
+      entityID: https://sso.dev.de/realms/by-antragraum-idp
   samlRegistrationSecretName: bayernid-saml-registration-secret
 
 tests:
@@ -47,7 +47,7 @@ tests:
           path: spec.template.spec.containers[0].volumeMounts
           content:
             name: tmp-volume
-            mountPath: "/tmp/antragsraum"
+            mountPath: "/tmp/antragraum"
             
   - it: should have volume for temp folder
     asserts:
diff --git a/server/src/test/helm/deployment_container_basic_test.yaml b/server/src/test/helm/deployment_container_basic_test.yaml
index a4d1e151131794d49f83fe64d5eb06958f471352..5129d006055dd81f7e292081612ec9c4811b8c01 100644
--- a/server/src/test/helm/deployment_container_basic_test.yaml
+++ b/server/src/test/helm/deployment_container_basic_test.yaml
@@ -24,7 +24,7 @@
 
 suite: test deployment container basics
 release:
-  name: antragsraum-server
+  name: antragraum-server
   namespace: sh-helm-test
 templates:
   - templates/deployment.yaml
@@ -32,12 +32,12 @@ set:
   ozgcloud:
     environment: dev
   imagePullSecret: test-image-secret
-  antragsraum:
+  antragraum:
     logoutSuccessUrl: https://test.antragsraum.de/?logout
-    antragraumProxyUrl: https://test.antragsraumproxy.de
+    antragraumProxyUrl: https://test.antragraumproxy.de
     infomanagerProxyUrl: https://test.infomanagerraumproxy.de
     saml:
-      entityID: https://sso.dev.de/realms/by-antragsraum-idp
+      entityID: https://sso.dev.de/realms/by-antragraum-idp
   samlRegistrationSecretName: bayernid-saml-registration-secret
 
 tests:
@@ -45,10 +45,10 @@ tests:
     asserts:
       - equal:
           path: spec.template.spec.containers[0].image
-          value: docker.ozg-sh.de/antragsraum-server:latest
+          value: docker.ozg-sh.de/antragraum-server:latest
       - equal:
           path: spec.template.spec.containers[0].name
-          value: antragsraum-server
+          value: antragraum-server
       - equal: 
           path: spec.template.spec.containers[0].imagePullPolicy
           value: Always
diff --git a/server/src/test/helm/deployment_container_other_values_test.yaml b/server/src/test/helm/deployment_container_other_values_test.yaml
index 56a5333f39fc25a18757104c00f52c36fb28a268..8e485fdd83898f54d2d226af7f34d13f6f1207fd 100644
--- a/server/src/test/helm/deployment_container_other_values_test.yaml
+++ b/server/src/test/helm/deployment_container_other_values_test.yaml
@@ -25,7 +25,7 @@
 
 suite: test deployment container other values
 release:
-  name: antragsraum-server
+  name: antragraum-server
   namespace: sh-helm-test
 templates:
   - templates/deployment.yaml
@@ -33,12 +33,12 @@ set:
   ozgcloud:
     environment: dev
   imagePullSecret: test-image-secret
-  antragsraum:
+  antragraum:
     logoutSuccessUrl: https://test.antragsraum.de/?logout
-    antragraumProxyUrl: https://test.antragsraumproxy.de
+    antragraumProxyUrl: https://test.antragraumproxy.de
     infomanagerProxyUrl: https://test.infomanagerraumproxy.de
     saml:
-      entityID: https://sso.dev.de/realms/by-antragsraum-idp
+      entityID: https://sso.dev.de/realms/by-antragraum-idp
   samlRegistrationSecretName: bayernid-saml-registration-secret
 tests:
   - it: should have correct values for container terminationMessagePolicy, terminationMessagePath, stdin, tty
diff --git a/server/src/test/helm/deployment_container_security_context_test.yaml b/server/src/test/helm/deployment_container_security_context_test.yaml
index 56fe5504c1d1b5b68a58ee392b29b95af8635408..6d9c428064bf42d45259695417c49838055da598 100644
--- a/server/src/test/helm/deployment_container_security_context_test.yaml
+++ b/server/src/test/helm/deployment_container_security_context_test.yaml
@@ -24,7 +24,7 @@
 
 suite: test deployment container security context
 release:
-  name: antragsraum-server
+  name: antragraum-server
   namespace: sh-helm-test
 templates:
   - templates/deployment.yaml
@@ -32,12 +32,12 @@ set:
   ozgcloud:
     environment: dev
   imagePullSecret: test-image-secret
-  antragsraum:
+  antragraum:
     logoutSuccessUrl: https://test.antragsraum.de/?logout
-    antragraumProxyUrl: https://test.antragsraumproxy.de
+    antragraumProxyUrl: https://test.antragraumproxy.de
     infomanagerProxyUrl: https://test.infomanagerraumproxy.de
     saml:
-      entityID: https://sso.dev.de/realms/by-antragsraum-idp
+      entityID: https://sso.dev.de/realms/by-antragraum-idp
   samlRegistrationSecretName: bayernid-saml-registration-secret
 
 tests:
diff --git a/server/src/test/helm/deployment_defaults_labels_test.yaml b/server/src/test/helm/deployment_defaults_labels_test.yaml
index 773c6bc590c7f506c7619b2244cd0de6800bf6ac..4b6a5e6003d9dfb090ac4c385044d606b1622cea 100644
--- a/server/src/test/helm/deployment_defaults_labels_test.yaml
+++ b/server/src/test/helm/deployment_defaults_labels_test.yaml
@@ -24,7 +24,7 @@
 
 suite: test deployment default labels
 release:
-  name: antragsraum-server
+  name: antragraum-server
   namespace: sh-helm-test
 templates:
   - templates/deployment.yaml
@@ -32,12 +32,12 @@ set:
   ozgcloud:
     environment: dev
   imagePullSecret: test-image-secret
-  antragsraum:
+  antragraum:
     logoutSuccessUrl: https://test.antragsraum.de/?logout
-    antragraumProxyUrl: https://test.antragsraumproxy.de
+    antragraumProxyUrl: https://test.antragraumproxy.de
     infomanagerProxyUrl: https://test.infomanagerraumproxy.de
     saml:
-      entityID: https://sso.dev.de/realms/by-antragsraum-idp
+      entityID: https://sso.dev.de/realms/by-antragraum-idp
   samlRegistrationSecretName: bayernid-saml-registration-secret
 tests:
   - it: check metadata.labels
@@ -45,20 +45,20 @@ tests:
       - equal:
           path: metadata.labels
           value:
-            app.kubernetes.io/instance: antragsraum-server
+            app.kubernetes.io/instance: antragraum-server
             app.kubernetes.io/managed-by: Helm
-            app.kubernetes.io/name: antragsraum-server
+            app.kubernetes.io/name: antragraum-server
             app.kubernetes.io/namespace: sh-helm-test
             app.kubernetes.io/part-of: ozgcloud
             app.kubernetes.io/version: 0.0.0-MANAGED-BY-JENKINS
-            helm.sh/chart: antragsraum-server-0.0.0-MANAGED-BY-JENKINS      
+            helm.sh/chart: antragraum-server-0.0.0-MANAGED-BY-JENKINS      
   
   - it: should set spec.selector.matchLabels
     asserts:
       - equal:
           path: spec.selector.matchLabels
           value:
-            app.kubernetes.io/name: antragsraum-server
+            app.kubernetes.io/name: antragraum-server
             app.kubernetes.io/namespace: sh-helm-test
 
 
@@ -67,11 +67,11 @@ tests:
       - equal:
           path: spec.template.metadata.labels
           value: 
-            app.kubernetes.io/instance: antragsraum-server
+            app.kubernetes.io/instance: antragraum-server
             app.kubernetes.io/managed-by: Helm
-            app.kubernetes.io/name: antragsraum-server
+            app.kubernetes.io/name: antragraum-server
             app.kubernetes.io/namespace: sh-helm-test
             app.kubernetes.io/part-of: ozgcloud
             app.kubernetes.io/version: 0.0.0-MANAGED-BY-JENKINS
-            component: antragsraum-server
-            helm.sh/chart: antragsraum-server-0.0.0-MANAGED-BY-JENKINS
\ No newline at end of file
+            component: antragraum-server
+            helm.sh/chart: antragraum-server-0.0.0-MANAGED-BY-JENKINS
\ No newline at end of file
diff --git a/server/src/test/helm/deployment_defaults_topologySpreadConstraints_test.yaml b/server/src/test/helm/deployment_defaults_topologySpreadConstraints_test.yaml
index 1da8eeceac635a8efe12db8c0fd9053ae479d781..0a260b759cb4d3f35af7eb517365064cfd422708 100644
--- a/server/src/test/helm/deployment_defaults_topologySpreadConstraints_test.yaml
+++ b/server/src/test/helm/deployment_defaults_topologySpreadConstraints_test.yaml
@@ -24,7 +24,7 @@
 
 suite: test deployment topology spread constrains
 release:
-  name: antragsraum-server
+  name: antragraum-server
   namespace: sh-helm-test
 templates:
   - templates/deployment.yaml
@@ -32,12 +32,12 @@ set:
   ozgcloud:
     environment: test
   imagePullSecret: test-image-secret
-  antragsraum:
+  antragraum:
     logoutSuccessUrl: https://test.antragsraum.de/?logout
-    antragraumProxyUrl: https://test.antragsraumproxy.de
+    antragraumProxyUrl: https://test.antragraumproxy.de
     infomanagerProxyUrl: https://test.infomanagerraumproxy.de
     saml:
-      entityID: https://sso.dev.de/realms/by-antragsraum-idp
+      entityID: https://sso.dev.de/realms/by-antragraum-idp
   samlRegistrationSecretName: bayernid-saml-registration-secret
 tests:
   - it: check default values of spec.template.spec.topologySpreadConstraints
@@ -55,4 +55,4 @@ tests:
           value: ScheduleAnyway
       - equal:
           path: spec.template.spec.topologySpreadConstraints[0].labelSelector.matchLabels["app.kubernetes.io/name"]
-          value: antragsraum-server
\ No newline at end of file
+          value: antragraum-server
\ No newline at end of file
diff --git a/server/src/test/helm/deployment_env_test.yaml b/server/src/test/helm/deployment_env_test.yaml
index 3849f0508a08c26b8fd1768224cb571678db1c6f..d8583fff1def75a18a9fa2e892e2d8db2825f669 100644
--- a/server/src/test/helm/deployment_env_test.yaml
+++ b/server/src/test/helm/deployment_env_test.yaml
@@ -29,9 +29,9 @@ set:
   ozgcloud:
     environment: dev
   imagePullSecret: test-image-secret
-  antragsraum:
+  antragraum:
     logoutSuccessUrl: https://test.antragsraum.de/?logout
-    antragraumProxyUrl: https://test.antragsraumproxy.de
+    antragraumProxyUrl: https://test.antragraumproxy.de
     infomanagerProxyUrl: https://test.infomanagerproxy.de
     saml:
       entityID: https://sso.dev.de/realms/by-antragsraum-idp
@@ -118,7 +118,7 @@ tests:
             name: OZGCLOUD_JWT_SECRET
             valueFrom:
               secretKeyRef:
-                name: antragsraum-jwt-secret
+                name: antragraum-jwt-secret
                 key: jwt-secret
                 optional: false
 
@@ -159,7 +159,7 @@ tests:
             valueFrom:
               secretKeyRef:
                 key: jwt-secret
-                name: antragsraum-jwt-secret
+                name: antragraum-jwt-secret
                 optional: false
 
   - it: should have correct OZGCLOUD_ANTRAGSRAUM_LOGOUTSUCCESSURL
@@ -176,7 +176,7 @@ tests:
           path: spec.template.spec.containers[0].env
           content:
             name: OZGCLOUD_ANTRAGSRAUM_NACHRICHT-PROXY_BASE-URL
-            value: https://test.antragsraumproxy.de
+            value: https://test.antragraumproxy.de
 
   - it: should have correct OZGCLOUD_ANTRAGSRAUM_INFOMANAGER-PROXY_BASE-URL
     asserts:
@@ -213,7 +213,7 @@ tests:
             value: -1
   - it: should set spring servlet envs 
     set: 
-      antragsraum:
+      antragraum:
         servlet:
           maxRequestSize: 40MB
           maxFileSize: 35MB
diff --git a/server/src/test/helm/deployment_host_aliases_test.yaml b/server/src/test/helm/deployment_host_aliases_test.yaml
index c086f092e79c370f3945e21d7fce76f7eb05c487..9412213d2b7a0f15ebc404e9623fa22d1f4a7df6 100644
--- a/server/src/test/helm/deployment_host_aliases_test.yaml
+++ b/server/src/test/helm/deployment_host_aliases_test.yaml
@@ -24,7 +24,7 @@
 
 suite: deployment host aliases
 release:
-  name: antragsraum-server
+  name: antragraum-server
   namespace: sh-helm-test
 templates:
   - templates/deployment.yaml
@@ -32,12 +32,12 @@ set:
   ozgcloud:
     environment: test
   imagePullSecret: test-image-secret
-  antragsraum:
+  antragraum:
     logoutSuccessUrl: https://test.antragsraum.de/?logout
-    antragraumProxyUrl: https://test.antragsraumproxy.de
+    antragraumProxyUrl: https://test.antragraumproxy.de
     infomanagerProxyUrl: https://test.infomanagerraumproxy.de
     saml:
-      entityID: https://sso.dev.de/realms/by-antragsraum-idp
+      entityID: https://sso.dev.de/realms/by-antragraum-idp
   samlRegistrationSecretName: bayernid-saml-registration-secret
 tests:
   - it: should not set spec.template.spec.hostAliases
diff --git a/server/src/test/helm/deployment_imagepull_secret_test.yaml b/server/src/test/helm/deployment_imagepull_secret_test.yaml
index 7d323b432846ef0b5dbbf002c93bd86f4b742067..6b2fe2fc22d1e1776a042d80e230c095b2180249 100644
--- a/server/src/test/helm/deployment_imagepull_secret_test.yaml
+++ b/server/src/test/helm/deployment_imagepull_secret_test.yaml
@@ -24,7 +24,7 @@
 
 suite: test deployment image pull secret
 release:
-  name: antragsraum-server
+  name: antragraum-server
   namespace: sh-helm-test
 templates:
   - templates/deployment.yaml
@@ -32,12 +32,12 @@ set:
   ozgcloud:
     environment: dev
   imagePullSecret: test-image-secret
-  antragsraum:
+  antragraum:
     logoutSuccessUrl: https://test.antragsraum.de/?logout
-    antragraumProxyUrl: https://test.antragsraumproxy.de
+    antragraumProxyUrl: https://test.antragraumproxy.de
     infomanagerProxyUrl: https://test.infomanagerraumproxy.de
     saml:
-      entityID: https://sso.dev.de/realms/by-antragsraum-idp
+      entityID: https://sso.dev.de/realms/by-antragraum-idp
   samlRegistrationSecretName: bayernid-saml-registration-secret
 tests:
   - it: should use correct imagePull secret
diff --git a/server/src/test/helm/deployment_pod_general_values_test.yaml b/server/src/test/helm/deployment_pod_general_values_test.yaml
index f79aae634120f97fe3e19c7d2bb124c442063445..7edd1acc54bf310e2d4e4b3be6eb117ee117904a 100644
--- a/server/src/test/helm/deployment_pod_general_values_test.yaml
+++ b/server/src/test/helm/deployment_pod_general_values_test.yaml
@@ -24,7 +24,7 @@
 
 suite: test deployment container basics
 release:
-  name: antragsraum-server
+  name: antragraum-server
   namespace: sh-helm-test
 templates:
   - templates/deployment.yaml
@@ -32,12 +32,12 @@ set:
   ozgcloud:
     environment: dev
   imagePullSecret: test-image-secret
-  antragsraum:
-    logoutSuccessUrl: https://dev.antragsraum.de/?logout
-    antragraumProxyUrl: https://test.antragsraumproxy.de
+  antragraum:
+    logoutSuccessUrl: https://dev.antragraum.de/?logout
+    antragraumProxyUrl: https://test.antragraumproxy.de
     infomanagerProxyUrl: https://test.infomanagerraumproxy.de
     saml:
-      entityID: https://sso.dev.de/realms/by-antragsraum-idp
+      entityID: https://sso.dev.de/realms/by-antragraum-idp
   samlRegistrationSecretName: bayernid-saml-registration-secret
 
 tests:
diff --git a/server/src/test/helm/deployment_resources_test.yaml b/server/src/test/helm/deployment_resources_test.yaml
index b6532236628f3d2c23071528d7a9588bc0868976..7c8a4ec2437049ee6cb1c9ccb172863b973580c2 100644
--- a/server/src/test/helm/deployment_resources_test.yaml
+++ b/server/src/test/helm/deployment_resources_test.yaml
@@ -24,19 +24,19 @@
 
 suite: test deployment container resources
 release:
-  name: antragsraum-server
+  name: antragraum-server
 templates:
   - templates/deployment.yaml
 set:
   ozgcloud:
     environment: dev
   imagePullSecret: test-image-secret
-  antragsraum:
+  antragraum:
     logoutSuccessUrl: https://test.antragsraum.de/?logout
-    antragraumProxyUrl: https://test.antragsraumproxy.de
+    antragraumProxyUrl: https://test.antragraumproxy.de
     infomanagerProxyUrl: https://test.infomanagerraumproxy.de
     saml:
-      entityID: https://sso.dev.de/realms/by-antragsraum-idp
+      entityID: https://sso.dev.de/realms/by-antragraum-idp
   samlRegistrationSecretName: bayernid-saml-registration-secret
 
 tests:
diff --git a/server/src/test/helm/deployment_service_account_test.yaml b/server/src/test/helm/deployment_service_account_test.yaml
index f9ea86ef2ee1ec6ee291d091f27763f7dfe49f18..43f2f58ea9fcf2a604d5b16628233cc83705ddd8 100644
--- a/server/src/test/helm/deployment_service_account_test.yaml
+++ b/server/src/test/helm/deployment_service_account_test.yaml
@@ -31,12 +31,12 @@ set:
   ozgcloud:
     environment: dev
   imagePullSecret: test-image-secret
-  antragsraum:
+  antragraum:
     logoutSuccessUrl: https://test.antragsraum.de/?logout
-    antragraumProxyUrl: https://test.antragsraumproxy.de
+    antragraumProxyUrl: https://test.antragraumproxy.de
     infomanagerProxyUrl: https://test.infomanagerraumproxy.de
     saml:
-      entityID: https://sso.dev.de/realms/by-antragsraum-idp
+      entityID: https://sso.dev.de/realms/by-antragraum-idp
   samlRegistrationSecretName: bayernid-saml-registration-secret
 
 tests:
@@ -47,7 +47,7 @@ tests:
     asserts:
       - equal:
           path: spec.template.spec.serviceAccountName
-          value: antragsraum-server-service-account
+          value: antragraum-server-service-account
   - it: should use service account with name
     set:
       serviceAccount:
diff --git a/server/src/test/helm/deployment_springProfile_test.yaml b/server/src/test/helm/deployment_springProfile_test.yaml
index 197d2249007a43afc50ed9fc8b6c97f90130bbc8..038fe9e64b8f0c7b129603442a9adb387c09adcb 100644
--- a/server/src/test/helm/deployment_springProfile_test.yaml
+++ b/server/src/test/helm/deployment_springProfile_test.yaml
@@ -24,7 +24,7 @@
 
 suite: test deployment spring profiles
 release:
-  name: antragsraum-server
+  name: antragraum-server
   namespace: sh-helm-test
 templates:
   - templates/deployment.yaml
@@ -32,12 +32,12 @@ set:
   ozgcloud:
     environment: test
   imagePullSecret: test-image-secret
-  antragsraum:
+  antragraum:
     logoutSuccessUrl: https://test.antragsraum.de/?logout
-    antragraumProxyUrl: https://test.antragsraumproxy.de
+    antragraumProxyUrl: https://test.antragraumproxy.de
     infomanagerProxyUrl: https://test.infomanagerraumproxy.de
     saml:
-      entityID: https://sso.dev.de/realms/by-antragsraum-idp
+      entityID: https://sso.dev.de/realms/by-antragraum-idp
   samlRegistrationSecretName: bayernid-saml-registration-secret
 tests:
   - it: should override the spring profiles
diff --git a/server/src/test/helm/deyploment_general_value_test.yaml b/server/src/test/helm/deyploment_general_value_test.yaml
index 4483d74f2aa83ab8e6c7bb72787253529804d7ee..19c10ba6fce6f94a7bd807b9dd91161d625dcbb3 100644
--- a/server/src/test/helm/deyploment_general_value_test.yaml
+++ b/server/src/test/helm/deyploment_general_value_test.yaml
@@ -24,7 +24,7 @@
 
 suite: test deployment general values
 release:
-  name: antragsraum-server
+  name: antragraum-server
   namespace: sh-helm-test
 templates:
   - templates/deployment.yaml
@@ -32,12 +32,12 @@ set:
   ozgcloud:
     environment: dev
   imagePullSecret: test-image-secret
-  antragsraum:
+  antragraum:
     logoutSuccessUrl: https://test.antragsraum.de/?logout
-    antragraumProxyUrl: https://test.antragsraumproxy.de
+    antragraumProxyUrl: https://test.antragraumproxy.de
     infomanagerProxyUrl: https://test.infomanagerraumproxy.de
     saml:
-      entityID: https://sso.dev.de/realms/by-antragsraum-idp
+      entityID: https://sso.dev.de/realms/by-antragraum-idp
   samlRegistrationSecretName: bayernid-saml-registration-secret
 
 tests:
@@ -52,7 +52,7 @@ tests:
     asserts: 
       - equal:
           path: metadata.name
-          value: antragsraum-server
+          value: antragraum-server
       - equal: 
           path: metadata.namespace
           value: sh-helm-test
diff --git a/server/src/test/helm/network_policy_test.yaml b/server/src/test/helm/network_policy_test.yaml
index 208f6198aba9f94eae9cf87053cc2ac2bb61d98f..94b040a7beba02208f0d0ba27e5db800f84748be 100644
--- a/server/src/test/helm/network_policy_test.yaml
+++ b/server/src/test/helm/network_policy_test.yaml
@@ -22,9 +22,9 @@
 # unter der Lizenz sind dem Lizenztext zu entnehmen.
 #
 
-suite: network policy antragsraum-server test
+suite: network policy antragraum-server test
 release:
-  name: antragsraum-server
+  name: antragraum-server
   namespace: by-helm-test
 templates:
   - templates/network_policy.yaml
@@ -56,7 +56,7 @@ tests:
       - equal:
           path: metadata
           value:
-            name: network-policy-antragsraum-server
+            name: network-policy-antragraum-server
             namespace: by-helm-test
 
   - it: validate podSelector
@@ -69,7 +69,7 @@ tests:
           path: spec.podSelector
           value:
             matchLabels:
-              component: antragsraum-server
+              component: antragraum-server
 
   - it: should add policyType Egress
     set:
diff --git a/server/src/test/helm/service_test.yaml b/server/src/test/helm/service_test.yaml
index 8ddfdc87c8682647c7d2e280d286112cb7c08cc6..49a22e37a7531695e7d86c6ccfd1c44d888786c0 100644
--- a/server/src/test/helm/service_test.yaml
+++ b/server/src/test/helm/service_test.yaml
@@ -24,7 +24,7 @@
 
 suite: test service
 release:
-  name: antragsraum-server
+  name: antragraum-server
   namespace: sh-helm-test
 templates:
   - templates/service.yaml
@@ -37,7 +37,7 @@ tests:
            of: v1
       - equal: 
           path: metadata.name
-          value: antragsraum-server
+          value: antragraum-server
       - equal: 
           path: metadata.namespace
           value: sh-helm-test
@@ -47,23 +47,23 @@ tests:
       - equal:
           path: metadata.labels
           value: 
-            app.kubernetes.io/instance: antragsraum-server
+            app.kubernetes.io/instance: antragraum-server
             app.kubernetes.io/managed-by: Helm
-            app.kubernetes.io/name: antragsraum-server
+            app.kubernetes.io/name: antragraum-server
             app.kubernetes.io/namespace: sh-helm-test
             app.kubernetes.io/part-of: ozgcloud
             app.kubernetes.io/version: 0.0.0-MANAGED-BY-JENKINS
-            component: antragsraum-server-service
-            helm.sh/chart: antragsraum-server-0.0.0-MANAGED-BY-JENKINS
+            component: antragraum-server-service
+            helm.sh/chart: antragraum-server-0.0.0-MANAGED-BY-JENKINS
 
   - it: selector should contain helm recommended labels
     asserts:
       - equal:
           path: spec.selector
           value:
-            app.kubernetes.io/name: antragsraum-server
+            app.kubernetes.io/name: antragraum-server
             app.kubernetes.io/namespace: sh-helm-test
-            component: antragsraum-server
+            component: antragraum-server
 
   - it: spec should contain ports with correct value
     asserts: