diff --git a/Jenkinsfile b/Jenkinsfile
index ecc96e59f3b8c03994264dcb9552f56a87972c1e..1c52fb2496f8138d35ca09c047658638937e7116 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -6,7 +6,7 @@ pipeline {
     }
 
     environment {
-        BLUE_OCEAN_URL = "https://jenkins.infra.ozg-cloud.systems/job/ozg-operator/job/${env.BRANCH_NAME}/${env.BUILD_NUMBER}/"
+        BLUE_OCEAN_URL = "https://jenkins.infra.ozg-cloud.systems/job/ozgcloud-keycloak-operator/job/${env.BRANCH_NAME}/${env.BUILD_NUMBER}/"
         RELEASE_REGEX = /\d+.\d+.\d+/
         SNAPSHOT_REGEX = /\d+.\d+.\d+-SNAPSHOT/
         FAILED_STAGE = ""
@@ -40,7 +40,7 @@ pipeline {
                 }
             }
         }
-        stage('Build OZG-Operator') {
+        stage('Build OzgCloud Keycloak Operator') {
             steps {
                 script {
                     FAILED_STAGE=env.STAGE_NAME
@@ -105,13 +105,13 @@ pipeline {
                     FAILED_STAGE=env.STAGE_NAME
                     IMAGE_TAG = generateImageTag()
 
-                    tagAndPushDockerImage('ozg-operator', IMAGE_TAG)
+                    tagAndPushDockerImage('ozgcloud-keycloak-operator', IMAGE_TAG)
                 
                     if (env.BRANCH_NAME == 'master') {
-                        tagAndPushDockerImage('ozg-operator', 'snapshot-latest')
+                        tagAndPushDockerImage('ozgcloud-keycloak-operator', 'snapshot-latest')
                     }
                     else if (env.BRANCH_NAME == 'release') {
-                        tagAndPushDockerImage('ozg-operator', 'latest')
+                        tagAndPushDockerImage('ozgcloud-keycloak-operator', 'latest')
                     }
                 }
             }
@@ -130,7 +130,7 @@ pipeline {
 
                         sh "helm package --version=${HELM_CHART_VERSION} ."
 
-                        deployHelmChart("ozg-operator", HELM_CHART_VERSION)
+                        deployHelmChart("ozgcloud-keycloak-operator", HELM_CHART_VERSION)
                     }
                 }
             }
@@ -229,9 +229,9 @@ String generateHelmChartVersion() {
 Void sendFailureMessage() {
     def room = ''
     def data = """{"msgtype":"m.text", \
-                    "body":"OZG-Operator: Build Failed. Stage: ${FAILED_STAGE} Build-ID: ${env.BUILD_NUMBER} Link: ${BLUE_OCEAN_URL}", \
+                    "body":"OzgCloud-Keycloak-Operator: Build Failed. Stage: ${FAILED_STAGE} Build-ID: ${env.BUILD_NUMBER} Link: ${BLUE_OCEAN_URL}", \
                     "format": "org.matrix.custom.html", \
-                    "formatted_body":"OZG-Operator: Build Failed. Stage: ${FAILED_STAGE} Build-ID: <a href='${BLUE_OCEAN_URL}'>${env.BUILD_NUMBER}</a>"}"""
+                    "formatted_body":"OzgCloud-Keycloak-Operator: 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"
@@ -259,11 +259,11 @@ Void setNewTestVersion() {
 
 Void setNewOzgOperatorVersion(String environment) {
     dir("gitops") {
-        def envFile = "${environment}/application/values/ozg-operator-values.yaml"
+        def envFile = "${environment}/application/values/ozgcloud-keycloak-operator-values.yaml"
         def envVersions = readYaml file: envFile
 
-        envVersions.ozg_operator.image.tag = IMAGE_TAG
-        envVersions.ozg_operator.helm.version = HELM_CHART_VERSION
+        envVersions.ozgcloud_keycloak_operator.image.tag = IMAGE_TAG
+        envVersions.ozgcloud_keycloak_operator.helm.version = HELM_CHART_VERSION
 
         writeYaml file: envFile, data: envVersions, overwrite: true
     }
@@ -284,16 +284,16 @@ Void pushNewGitopsVersion(String environment) {
         }
         
         withCredentials([usernamePassword(credentialsId: 'jenkins-gitea-access-token', passwordVariable: 'TOKEN', usernameVariable: 'USER')]) {            
-            sh "git add ${environment}/application/values/ozg-operator-values.yaml"
+            sh "git add ${environment}/application/values/ozgcloud-keycloak-operator-values.yaml"
 
-            sh "git commit -m 'jenkins rollout ${environment} ozg-operator version ${IMAGE_TAG}'"
-            sh 'git push https://${USER}:${TOKEN}@git.ozg-sh.de/mgm/gitops.git'
+            sh "git commit -m 'jenkins rollout ${environment} ozgcloud-keycloak-operator 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/ozg-operator-values.yaml'", returnStatus: true) == env.SH_SUCCESS_STATUS_CODE as Integer
+    return sh (script: "git status | grep '${environment}/application/values/ozgcloud-keycloak-operator-values.yaml'", returnStatus: true) == env.SH_SUCCESS_STATUS_CODE as Integer
 }
 
 Void configureGit() {
@@ -308,7 +308,7 @@ Void configureGit() {
 
 Void cloneGitopsRepo() {
     withCredentials([usernamePassword(credentialsId: 'jenkins-gitea-access-token', passwordVariable: 'TOKEN', usernameVariable: 'USER')]) {
-        sh 'git clone https://${USER}:${TOKEN}@git.ozg-sh.de/mgm/gitops.git'
+        sh 'git clone https://${USER}:${TOKEN}@git.ozg-sh.de/ozgcloud-devops/gitops.git'
     }
 
     configureGit()
diff --git a/doc/ServiceAccount/serviceaccount_keycloak_read.yaml b/doc/ServiceAccount/serviceaccount_keycloak_read.yaml
deleted file mode 100644
index 2ee9466e9a025498c71aac9335b7772b7a011dc0..0000000000000000000000000000000000000000
--- a/doc/ServiceAccount/serviceaccount_keycloak_read.yaml
+++ /dev/null
@@ -1,62 +0,0 @@
-#
-# Copyright (C) 2022 Das Land Schleswig-Holstein vertreten durch den
-# Ministerpräsidenten des Landes Schleswig-Holstein
-# Staatskanzlei
-# Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
-#
-# Lizenziert unter der EUPL, Version 1.2 oder - sobald
-# diese von der Europäischen Kommission genehmigt wurden -
-# Folgeversionen der EUPL ("Lizenz");
-# Sie dürfen dieses Werk ausschließlich gemäß
-# dieser Lizenz nutzen.
-# Eine Kopie der Lizenz finden Sie hier:
-#
-# https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
-#
-# Sofern nicht durch anwendbare Rechtsvorschriften
-# gefordert oder in schriftlicher Form vereinbart, wird
-# die unter der Lizenz verbreitete Software "so wie sie
-# ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
-# ausdrücklich oder stillschweigend - verbreitet.
-# Die sprachspezifischen Genehmigungen und Beschränkungen
-# unter der Lizenz sind dem Lizenztext zu entnehmen.
-#
-
----
-kind: ClusterRoleBinding
-apiVersion: rbac.authorization.k8s.io/v1
-metadata:
-  name: ozg-operator-keycloak-viewer-role-binding
-subjects:
-  - kind: ServiceAccount
-    name: ozg-operator-serviceaccount
-    namespace: by-ozg-operator-dev
-roleRef:
-  kind: ClusterRole
-  name: ozg-operator-keycloak-viewer-role
-  apiGroup: rbac.authorization.k8s.io
----
-kind: ClusterRole
-apiVersion: rbac.authorization.k8s.io/v1
-metadata:
-  name: ozg-operator-keycloak-viewer-role
-rules:
-  - apiGroups:
-      - "*"
-    resources:
-      - ozgkeycloakusers
-      - ozgkeycloakusers/status
-      - ozgkeycloakusers/finalizers
-      - ozgkeycloakgroups
-      - ozgkeycloakgroups/status
-      - ozgkeycloakgroups/finalizers
-      - ozgkeycloakrealms
-      - ozgkeycloakrealms/status
-      - ozgkeycloakrealms/finalizers
-      - ozgkeycloakclients
-      - ozgkeycloakclients/status
-      - ozgkeycloakclients/finalizers
-    verbs:
-      - get
-      - list
-      - watch
diff --git a/doc/ServiceAccount/serviceaccount_keycloak_secrets_read.yaml b/doc/ServiceAccount/serviceaccount_keycloak_secrets_read.yaml
deleted file mode 100644
index 5f3efc0208a8239360e910ff5559865442e3f189..0000000000000000000000000000000000000000
--- a/doc/ServiceAccount/serviceaccount_keycloak_secrets_read.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-# Copyright (C) 2022 Das Land Schleswig-Holstein vertreten durch den
-# Ministerpräsidenten des Landes Schleswig-Holstein
-# Staatskanzlei
-# Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
-#
-# Lizenziert unter der EUPL, Version 1.2 oder - sobald
-# diese von der Europäischen Kommission genehmigt wurden -
-# Folgeversionen der EUPL ("Lizenz");
-# Sie dürfen dieses Werk ausschließlich gemäß
-# dieser Lizenz nutzen.
-# Eine Kopie der Lizenz finden Sie hier:
-#
-# https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
-#
-# Sofern nicht durch anwendbare Rechtsvorschriften
-# gefordert oder in schriftlicher Form vereinbart, wird
-# die unter der Lizenz verbreitete Software "so wie sie
-# ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
-# ausdrücklich oder stillschweigend - verbreitet.
-# Die sprachspezifischen Genehmigungen und Beschränkungen
-# unter der Lizenz sind dem Lizenztext zu entnehmen.
-#
-
-kind: RoleBinding
-apiVersion: rbac.authorization.k8s.io/v1
-metadata:
-  name: ozg-operator-keycloak-secrets-viewer-role-binding
-  namespace: keycloak
-subjects:
-  - kind: ServiceAccount
-    name: ozg-operator-serviceaccount
-    namespace: by-ozg-operator-dev     
-roleRef:
-  kind: Role
-  name: ozg-operator-keycloak-secrets-viewer-role
-  apiGroup: rbac.authorization.k8s.io
----
-kind: Role
-apiVersion: rbac.authorization.k8s.io/v1
-metadata:
-  name: ozg-operator-keycloak-secrets-viewer-role
-  namespace: keycloak
-rules:
-  - apiGroups:
-      - "*"
-    resources:
-      - secrets
-    verbs:
-      - get
diff --git a/doc/ServiceAccount/serviceaccount_keycloak_write.yaml b/doc/ServiceAccount/serviceaccount_keycloak_write.yaml
deleted file mode 100644
index 2eda24e8cbe5e6c11510a887dfff5292d33eec35..0000000000000000000000000000000000000000
--- a/doc/ServiceAccount/serviceaccount_keycloak_write.yaml
+++ /dev/null
@@ -1,66 +0,0 @@
-#
-# Copyright (C) 2022 Das Land Schleswig-Holstein vertreten durch den
-# Ministerpräsidenten des Landes Schleswig-Holstein
-# Staatskanzlei
-# Abteilung Digitalisierung und zentrales IT-Management der Landesregierung
-#
-# Lizenziert unter der EUPL, Version 1.2 oder - sobald
-# diese von der Europäischen Kommission genehmigt wurden -
-# Folgeversionen der EUPL ("Lizenz");
-# Sie dürfen dieses Werk ausschließlich gemäß
-# dieser Lizenz nutzen.
-# Eine Kopie der Lizenz finden Sie hier:
-#
-# https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
-#
-# Sofern nicht durch anwendbare Rechtsvorschriften
-# gefordert oder in schriftlicher Form vereinbart, wird
-# die unter der Lizenz verbreitete Software "so wie sie
-# ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN -
-# ausdrücklich oder stillschweigend - verbreitet.
-# Die sprachspezifischen Genehmigungen und Beschränkungen
-# unter der Lizenz sind dem Lizenztext zu entnehmen.
-#
-
----
-kind: ClusterRoleBinding
-apiVersion: rbac.authorization.k8s.io/v1
-metadata:
-  name: ozg-operator-keycloak-write-role-binding
-subjects:
-  - kind: ServiceAccount
-    name: ozg-operator-serviceaccount
-    namespace: by-ozg-operator-dev
-roleRef:
-  kind: ClusterRole
-  name: ozg-operator-keycloak-write-role
-  apiGroup: rbac.authorization.k8s.io
----
-kind: ClusterRole
-apiVersion: rbac.authorization.k8s.io/v1
-metadata:
-  name: ozg-operator-keycloak-write-role
-rules:
-  - apiGroups:
-      - "*"
-    resources:
-      - ozgkeycloakusers
-      - ozgkeycloakusers/status
-      - ozgkeycloakusers/finalizers
-      - ozgkeycloakgroups
-      - ozgkeycloakgroups/status
-      - ozgkeycloakgroups/finalizers
-      - ozgkeycloakrealms
-      - ozgkeycloakrealms/status
-      - ozgkeycloakrealms/finalizers
-      - ozgkeycloakclients
-      - ozgkeycloakclients/status
-      - ozgkeycloakclients/finalizers
-    verbs:
-      - get
-      - list
-      - create
-      - delete
-      - patch
-      - update
-      - watch
diff --git a/doc/crds/operator.ozgcloud.de_OzgKeycloakClient.yaml b/doc/crds/operator.ozgcloud.de_OzgKeycloakClient.yaml
deleted file mode 100644
index 52393bef17ac4668f7433d7ba64b2b75f4b5490e..0000000000000000000000000000000000000000
--- a/doc/crds/operator.ozgcloud.de_OzgKeycloakClient.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
----
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
-  name: ozgkeycloakclients.operator.ozgcloud.de
-spec:
-  group: operator.ozgcloud.de
-  names:
-    kind: OzgKeycloakClient
-    listKind: OzgKeycloakClientList
-    plural: ozgkeycloakclients
-    singular: ozgkeycloakclient
-  scope: Namespaced
-  versions:
-  - name: v1
-    schema:
-      openAPIV3Schema:
-        description: OzgKeycloakClient is the Schema for the keycloaks API
-        properties:
-          apiVersion:
-            description: 'APIVersion defines the versioned schema of this representation
-              of an object. Servers should convert recognized schemas to the latest
-              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
-            type: string
-          kind:
-            description: 'Kind is a string value representing the REST resource this
-              object represents. Servers may infer this from the endpoint the client
-              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-            type: string
-          metadata:
-            type: object
-          spec:
-            description: Spec defines the desired state of Keycloak
-            type: object
-            x-kubernetes-preserve-unknown-fields: true
-          status:
-            description: Status defines the observed state of Keycloak
-            type: object
-            x-kubernetes-preserve-unknown-fields: true
-        type: object
-    served: true
-    storage: true
-    subresources:
-      status: {}
diff --git a/doc/crds/operator.ozgcloud.de_OzgKeycloakGroup.yaml b/doc/crds/operator.ozgcloud.de_OzgKeycloakGroup.yaml
deleted file mode 100644
index ee88ea0051af823a7b7e9913f6c6d8615bb84500..0000000000000000000000000000000000000000
--- a/doc/crds/operator.ozgcloud.de_OzgKeycloakGroup.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
----
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
-  name: ozgkeycloakgroups.operator.ozgcloud.de
-spec:
-  group: operator.ozgcloud.de
-  names:
-    kind: OzgKeycloakGroup
-    listKind: OzgKeycloakGroupList
-    plural: ozgkeycloakgroups
-    singular: ozgkeycloakgroup
-  scope: Namespaced
-  versions:
-  - name: v1
-    schema:
-      openAPIV3Schema:
-        description: OzgKeycloakGroup is the Schema for the keycloaks API
-        properties:
-          apiVersion:
-            description: 'APIVersion defines the versioned schema of this representation
-              of an object. Servers should convert recognized schemas to the latest
-              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
-            type: string
-          kind:
-            description: 'Kind is a string value representing the REST resource this
-              object represents. Servers may infer this from the endpoint the client
-              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-            type: string
-          metadata:
-            type: object
-          spec:
-            description: Spec defines the desired state of Keycloak
-            type: object
-            x-kubernetes-preserve-unknown-fields: true
-          status:
-            description: Status defines the observed state of Keycloak
-            type: object
-            x-kubernetes-preserve-unknown-fields: true
-        type: object
-    served: true
-    storage: true
-    subresources:
-      status: {}
diff --git a/doc/crds/operator.ozgcloud.de_OzgKeycloakRealms.yaml b/doc/crds/operator.ozgcloud.de_OzgKeycloakRealms.yaml
deleted file mode 100644
index ed46ad75073c92b888ef3668317dcf92726bb41c..0000000000000000000000000000000000000000
--- a/doc/crds/operator.ozgcloud.de_OzgKeycloakRealms.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
----
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
-  name: ozgkeycloakrealms.operator.ozgcloud.de
-spec:
-  group: operator.ozgcloud.de
-  names:
-    kind: OzgKeycloakRealm
-    listKind: OzgKeycloakRealmList
-    plural: ozgkeycloakrealms
-    singular: ozgkeycloakrealm
-  scope: Namespaced
-  versions:
-  - name: v1
-    schema:
-      openAPIV3Schema:
-        description: OzgKeycloakRealm is the Schema for the keycloak API
-        properties:
-          apiVersion:
-            description: 'APIVersion defines the versioned schema of this representation
-              of an object. Servers should convert recognized schemas to the latest
-              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
-            type: string
-          kind:
-            description: 'Kind is a string value representing the REST resource this
-              object represents. Servers may infer this from the endpoint the client
-              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-            type: string
-          metadata:
-            type: object
-          spec:
-            description: Spec defines the desired state of Keycloak
-            type: object
-            x-kubernetes-preserve-unknown-fields: true
-          status:
-            description: Status defines the observed state of Keycloak
-            type: object
-            x-kubernetes-preserve-unknown-fields: true
-        type: object
-    served: true
-    storage: true
-    subresources:
-      status: {}
diff --git a/doc/crds/operator.ozgcloud.de_OzgKeycloakUser.yaml b/doc/crds/operator.ozgcloud.de_OzgKeycloakUser.yaml
deleted file mode 100644
index 6100f5451c7194d7827c668aa355ec43423200e9..0000000000000000000000000000000000000000
--- a/doc/crds/operator.ozgcloud.de_OzgKeycloakUser.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
----
-apiVersion: apiextensions.k8s.io/v1
-kind: CustomResourceDefinition
-metadata:
-  name: ozgkeycloakusers.operator.ozgcloud.de
-spec:
-  group: operator.ozgcloud.de
-  names:
-    kind: OzgKeycloakUser
-    listKind: OzgKeycloakUserList
-    plural: ozgkeycloakusers
-    singular: ozgkeycloakuser
-  scope: Namespaced
-  versions:
-  - name: v1
-    schema:
-      openAPIV3Schema:
-        description: OzgKeycloakUser is the Schema for the keycloaks API
-        properties:
-          apiVersion:
-            description: 'APIVersion defines the versioned schema of this representation
-              of an object. Servers should convert recognized schemas to the latest
-              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
-            type: string
-          kind:
-            description: 'Kind is a string value representing the REST resource this
-              object represents. Servers may infer this from the endpoint the client
-              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-            type: string
-          metadata:
-            type: object
-          spec:
-            description: Spec defines the desired state of Keycloak
-            type: object
-            x-kubernetes-preserve-unknown-fields: true
-          status:
-            description: Status defines the observed state of Keycloak
-            type: object
-            x-kubernetes-preserve-unknown-fields: true
-        type: object
-    served: true
-    storage: true
-    subresources:
-      status: {}
diff --git a/doc/examples/client-alfa.yaml b/doc/examples/client-alfa.yaml
index 8b77970e81ccf183b6740e6daa31aabb7931a9a1..1c109fb108be45a7b22ecf0bf2bf4843192af777 100644
--- a/doc/examples/client-alfa.yaml
+++ b/doc/examples/client-alfa.yaml
@@ -1,14 +1,14 @@
 apiVersion: operator.ozgcloud.de/v1
-kind: OzgKeycloakClient
+kind: OzgCloudKeycloakClient
 metadata:
   name: alfa-keycloak-client1
-  namespace: by-torsten-ozg-operator-dev
+  namespace: by-torsten-ozgcloud-keycloak-operator-dev
 spec:
-  client_base_url: https://torsten-ozg-operator.dev.by.ozg-cloud.de
+  client_base_url: https://torsten-ozgcloud-keycloak-operator.dev.by.ozg-cloud.de
   client_name: alfa1
   client_redirect_uris:
-    - https://torsten-ozg-operator.dev.by.ozg-cloud.de
-    - https://torsten-ozg-operator.dev.by.ozg-cloud.de/*
+    - https://torsten-ozgcloud-keycloak-operator.dev.by.ozg-cloud.de
+    - https://torsten-ozgcloud-keycloak-operator.dev.by.ozg-cloud.de/*
     - http://localhost:4300
     - http://localhost:4300/*
     - http://192.168.178.20:4300
@@ -18,7 +18,7 @@ spec:
     - name: VERWALTUNG_POSTSTELLE
     - name: VERWALTUNG_USER
   client_web_origins:
-    - https://torsten-ozg-operator.dev.by.ozg-cloud.de
+    - https://torsten-ozgcloud-keycloak-operator.dev.by.ozg-cloud.de
   keep_after_delete: false
   protocol_mappers:
     - name: organisationseinheitIdMapper
diff --git a/doc/examples/realm-berlin.yaml b/doc/examples/realm-berlin.yaml
index e26cb62e64cf3461c18880964dec643569ec469d..fc51ba6eb295649b5393354c85444a9efd32f13a 100644
--- a/doc/examples/realm-berlin.yaml
+++ b/doc/examples/realm-berlin.yaml
@@ -1,14 +1,10 @@
 apiVersion: operator.ozgcloud.de/v1
-kind: OzgKeycloakRealm
+kind: OzgCloudKeycloakRealm
 metadata:
   name: by-berlintest-dev
-  namespace: by-torsten-ozg-operator-dev
+  namespace: by-torsten-ozgcloud-keycloak-operator-dev
 spec:
   keep_after_delete: false
   kommune: by-kiel-dev
-  kop_bezeichner: kiel
-  kop_displayname: Realm für Kiel (dev)
-  kop_einheitlicher_ansprechpartner: false
-  kop_env_base_url: dev.by.ozg-cloud.de
-  kop_enviroment: dev
-  kop_sso_url: https://sso.dev.by.ozg-cloud.de
+  displayName: Realm für Kiel (dev)
+
diff --git a/doc/examples/user-helge.yaml b/doc/examples/user-helge.yaml
index e2a9460bbe4c1b7d99a751fb4557e4aedf719d02..ac00115c4f9d511d797029436518b260657265c6 100644
--- a/doc/examples/user-helge.yaml
+++ b/doc/examples/user-helge.yaml
@@ -1,8 +1,8 @@
 apiVersion: operator.ozgcloud.de/v1
-kind: OzgKeycloakUser
+kind: OzgCloudKeycloakUser
 metadata:
   name: helge
-  namespace: by-torsten-ozg-operator-dev
+  namespace: by-torsten-ozgcloud-keycloak-operator-dev
 spec:
   keep_after_delete: false
   keycloak_user:
@@ -17,5 +17,4 @@ spec:
     last_name: helge
     password: Y9nk43yrQ_zzIPpfFU-I
     username: helge
-  kop_sso_url: https://sso.dev.by.ozg-cloud.de
 
diff --git a/pom.xml b/pom.xml
index 5ed1b48112d92e363052e7d1ce681f2ff09db058..039937c77597af4ffd37f2cd8e6fa91c28dcdf16 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,13 +10,13 @@
 	</parent>
 
 	<groupId>de.ozgcloud</groupId>
-	<artifactId>ozg-operator</artifactId>
-	<version>1.2.0-SNAPSHOT</version>
-	<name>OZG Cloud Operator</name>
-	<description>OZG Cloud Operator</description>
+	<artifactId>ozgcloud-keycloak-operator</artifactId>
+	<version>2.0.0-SNAPSHOT</version>
+	<name>OzgCloud Keycloak Operator</name>
+	<description>OzgCloud Keycloak Operator</description>
 	
 	<properties>
-		<spring-boot.build-image.imageName>docker.ozg-sh.de/ozg-operator:build-latest</spring-boot.build-image.imageName>
+		<spring-boot.build-image.imageName>docker.ozg-sh.de/ozgcloud-keycloak-operator:build-latest</spring-boot.build-image.imageName>
 		
 		<operator-sdk.version>5.2.0</operator-sdk.version>
 		<mapstruct.version>1.5.5.Final</mapstruct.version>
diff --git a/run-local.sh b/run-local.sh
index 7b6cff12a8e1111c664578c9ccab3cf9cb3079fb..32c96b49b2bb9a3a76934e1325b991b7f12f51b1 100755
--- a/run-local.sh
+++ b/run-local.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-docker run --rm -p 8080:8080 docker.ozg-sh.de/ozg-operator:build-latest
+docker run --rm -p 8080:8080 docker.ozg-sh.de/ozgcloud-keycloak-operator:build-latest
diff --git a/src/main/helm/Chart.yaml b/src/main/helm/Chart.yaml
index 72a2fbf301e8dc641ed992bf5aa0a55524148acd..25e247ca5d46a6c7dbaa325d627e0f863559a68a 100644
--- a/src/main/helm/Chart.yaml
+++ b/src/main/helm/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
-name: ozg-operator
-description: OZG Cloud Operator
+name: ozgcloud-keycloak-operator
+description: OZG Cloud Keycloak Operator
 type: application
 version: 0.0.0-MANAGED-BY-JENKINS
 appVersion: "0.0.0-MANAGED-BY-JENKINS"
diff --git a/src/main/helm/templates/crds/operator.ozgcloud.de_OzgKeycloakClient.yaml b/src/main/helm/templates/crds/operator.ozgcloud.de_OzgKeycloakClient.yaml
index 52393bef17ac4668f7433d7ba64b2b75f4b5490e..48e43dede1c1dcca8c93cce42bf210f64196f24a 100644
--- a/src/main/helm/templates/crds/operator.ozgcloud.de_OzgKeycloakClient.yaml
+++ b/src/main/helm/templates/crds/operator.ozgcloud.de_OzgKeycloakClient.yaml
@@ -6,8 +6,8 @@ metadata:
 spec:
   group: operator.ozgcloud.de
   names:
-    kind: OzgKeycloakClient
-    listKind: OzgKeycloakClientList
+    kind: OzgCloudKeycloakClient
+    listKind: OzgCloudKeycloakClientList
     plural: ozgkeycloakclients
     singular: ozgkeycloakclient
   scope: Namespaced
@@ -15,7 +15,7 @@ spec:
   - name: v1
     schema:
       openAPIV3Schema:
-        description: OzgKeycloakClient is the Schema for the keycloaks API
+        description: OzgCloudKeycloakClient is the Schema for the keycloaks API
         properties:
           apiVersion:
             description: 'APIVersion defines the versioned schema of this representation
diff --git a/src/main/helm/templates/crds/operator.ozgcloud.de_OzgKeycloakGroup.yaml b/src/main/helm/templates/crds/operator.ozgcloud.de_OzgKeycloakGroup.yaml
index ee88ea0051af823a7b7e9913f6c6d8615bb84500..8f97e2a4322e87db2f6e43b7b92405286c0732da 100644
--- a/src/main/helm/templates/crds/operator.ozgcloud.de_OzgKeycloakGroup.yaml
+++ b/src/main/helm/templates/crds/operator.ozgcloud.de_OzgKeycloakGroup.yaml
@@ -6,8 +6,8 @@ metadata:
 spec:
   group: operator.ozgcloud.de
   names:
-    kind: OzgKeycloakGroup
-    listKind: OzgKeycloakGroupList
+    kind: OzgCloudKeycloakGroup
+    listKind: OzgCloudKeycloakGroupList
     plural: ozgkeycloakgroups
     singular: ozgkeycloakgroup
   scope: Namespaced
@@ -15,7 +15,7 @@ spec:
   - name: v1
     schema:
       openAPIV3Schema:
-        description: OzgKeycloakGroup is the Schema for the keycloaks API
+        description: OzgCloudKeycloakGroup is the Schema for the keycloaks API
         properties:
           apiVersion:
             description: 'APIVersion defines the versioned schema of this representation
diff --git a/src/main/helm/templates/crds/operator.ozgcloud.de_OzgKeycloakRealms.yaml b/src/main/helm/templates/crds/operator.ozgcloud.de_OzgKeycloakRealms.yaml
index ed46ad75073c92b888ef3668317dcf92726bb41c..7a0a715c565c68c469f5d481c726eed3c3546728 100644
--- a/src/main/helm/templates/crds/operator.ozgcloud.de_OzgKeycloakRealms.yaml
+++ b/src/main/helm/templates/crds/operator.ozgcloud.de_OzgKeycloakRealms.yaml
@@ -6,8 +6,8 @@ metadata:
 spec:
   group: operator.ozgcloud.de
   names:
-    kind: OzgKeycloakRealm
-    listKind: OzgKeycloakRealmList
+    kind: OzgCloudKeycloakRealm
+    listKind: OzgCloudKeycloakRealmList
     plural: ozgkeycloakrealms
     singular: ozgkeycloakrealm
   scope: Namespaced
@@ -15,7 +15,7 @@ spec:
   - name: v1
     schema:
       openAPIV3Schema:
-        description: OzgKeycloakRealm is the Schema for the keycloak API
+        description: OzgCloudKeycloakRealm is the Schema for the keycloak API
         properties:
           apiVersion:
             description: 'APIVersion defines the versioned schema of this representation
diff --git a/src/main/helm/templates/crds/operator.ozgcloud.de_OzgKeycloakUser.yaml b/src/main/helm/templates/crds/operator.ozgcloud.de_OzgKeycloakUser.yaml
index 6100f5451c7194d7827c668aa355ec43423200e9..e3a24f2e6fe032abc0435df081971a0bf9d27f99 100644
--- a/src/main/helm/templates/crds/operator.ozgcloud.de_OzgKeycloakUser.yaml
+++ b/src/main/helm/templates/crds/operator.ozgcloud.de_OzgKeycloakUser.yaml
@@ -6,8 +6,8 @@ metadata:
 spec:
   group: operator.ozgcloud.de
   names:
-    kind: OzgKeycloakUser
-    listKind: OzgKeycloakUserList
+    kind: OzgCloudKeycloakUser
+    listKind: OzgCloudKeycloakUserList
     plural: ozgkeycloakusers
     singular: ozgkeycloakuser
   scope: Namespaced
@@ -15,7 +15,7 @@ spec:
   - name: v1
     schema:
       openAPIV3Schema:
-        description: OzgKeycloakUser is the Schema for the keycloaks API
+        description: OzgCloudKeycloakUser is the Schema for the keycloaks API
         properties:
           apiVersion:
             description: 'APIVersion defines the versioned schema of this representation
diff --git a/src/main/helm/templates/deployment.yaml b/src/main/helm/templates/deployment.yaml
index 79e994ebf4cd1fec736d3328fe81ab269d271b8f..93e9c335185b344a674ee76596253dd9950f7851 100644
--- a/src/main/helm/templates/deployment.yaml
+++ b/src/main/helm/templates/deployment.yaml
@@ -44,9 +44,9 @@ spec:
       labels:
       {{- include "app.matchLabels" . | indent 8 }}
     spec:
-      serviceAccountName: ozg-operator-serviceaccount
+      serviceAccountName: ozgcloud-keycloak-operator-serviceaccount
       containers:
-      - name: ozg-operator
+      - name: ozgcloud-keycloak-operator
         image: "{{ required "image.repo must be set" (.Values.image).repo }}/{{ required "image.name must be set" (.Values.image).name }}:{{ required "image.tag must be set" (.Values.image).tag }}"
         env:
         {{- with (.Values.env).customList }}
diff --git a/src/main/helm/templates/rbacs/keycloak_admin_secret_read.yaml b/src/main/helm/templates/rbacs/keycloak_admin_secret_read.yaml
index b38ae12bd95b52c9a1ea412197e7f101443844c5..bdeabe9c8b3141eedbb9d11ed35fae962e1f7c04 100644
--- a/src/main/helm/templates/rbacs/keycloak_admin_secret_read.yaml
+++ b/src/main/helm/templates/rbacs/keycloak_admin_secret_read.yaml
@@ -25,21 +25,21 @@
 kind: RoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: ozg-operator-keycloak-admin-secret-viewer-role-binding
+  name: ozgcloud-keycloak-operator-admin-secret-viewer-role-binding
   namespace: keycloak
 subjects:
   - kind: ServiceAccount
-    name: ozg-operator-serviceaccount
+    name: ozgcloud-keycloak-operator-serviceaccount
     namespace: {{ .Release.Namespace }}
 roleRef:
   kind: Role
-  name: ozg-operator-keycloak-admin-secret-viewer-role
+  name: ozgcloud-keycloak-operator-admin-secret-viewer-role
   apiGroup: rbac.authorization.k8s.io
 ---
 kind: Role
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: ozg-operator-keycloak-admin-secret-viewer-role
+  name: ozgcloud-keycloak-operator-admin-secret-viewer-role
   namespace: keycloak
 rules:
   - apiGroups:
diff --git a/src/main/helm/templates/rbacs/keycloak_read.yaml b/src/main/helm/templates/rbacs/keycloak_read.yaml
index 0951f3cb825c2d15e554b3e3ba2661c552a020a0..3f06a8e17cd5ca203d93f6323533307c935ab35a 100644
--- a/src/main/helm/templates/rbacs/keycloak_read.yaml
+++ b/src/main/helm/templates/rbacs/keycloak_read.yaml
@@ -26,36 +26,36 @@
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: ozg-operator-keycloak-viewer-role-binding
+  name: ozgcloud-keycloak-operator-viewer-role-binding
 subjects:
   - kind: ServiceAccount
-    name: ozg-operator-serviceaccount
+    name: ozgcloud-keycloak-operator-serviceaccount
     namespace: {{ .Release.Namespace }}
 roleRef:
   kind: ClusterRole
-  name: ozg-operator-keycloak-viewer-role
+  name: ozgcloud-keycloak-operator-viewer-role
   apiGroup: rbac.authorization.k8s.io
 ---
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: ozg-operator-keycloak-viewer-role
+  name: ozgcloud-keycloak-operator-viewer-role
 rules:
   - apiGroups:
       - operator.ozgcloud.de
     resources:
-      - ozgkeycloakusers
-      - ozgkeycloakusers/status
-      - ozgkeycloakusers/finalizers
-      - ozgkeycloakgroups
-      - ozgkeycloakgroups/status
-      - ozgkeycloakgroups/finalizers
-      - ozgkeycloakrealms
-      - ozgkeycloakrealms/status
-      - ozgkeycloakrealms/finalizers
-      - ozgkeycloakclients
-      - ozgkeycloakclients/status
-      - ozgkeycloakclients/finalizers
+      - ozgcloudkeycloakusers
+      - ozgcloudkeycloakusers/status
+      - ozgcloudkeycloakusers/finalizers
+      - ozgcloudkeycloakgroups
+      - ozgcloudkeycloakgroups/status
+      - ozgcloudkeycloakgroups/finalizers
+      - ozgcloudkeycloakrealms
+      - ozgcloudkeycloakrealms/status
+      - ozgcloudkeycloakrealms/finalizers
+      - ozgcloudkeycloakclients
+      - ozgcloudkeycloakclients/status
+      - ozgcloudkeycloakclients/finalizers
     verbs:
       - get
       - list
diff --git a/src/main/helm/templates/rbacs/keycloak_write.yaml b/src/main/helm/templates/rbacs/keycloak_write.yaml
index 1cee24d8ec3921bafda009acd8f3a30bfc15fa5f..2ec2cee30e234bdd10d92b590baba4931767fafb 100644
--- a/src/main/helm/templates/rbacs/keycloak_write.yaml
+++ b/src/main/helm/templates/rbacs/keycloak_write.yaml
@@ -26,36 +26,36 @@
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: ozg-operator-keycloak-write-role-binding
+  name: ozgcloud-keycloak-operator-write-role-binding
 subjects:
   - kind: ServiceAccount
-    name: ozg-operator-serviceaccount
+    name: ozgcloud-keycloak-operator-serviceaccount
     namespace: {{ .Release.Namespace }}
 roleRef:
   kind: ClusterRole
-  name: ozg-operator-keycloak-write-role
+  name: ozgcloud-keycloak-operator-write-role
   apiGroup: rbac.authorization.k8s.io
 ---
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: ozg-operator-keycloak-write-role
+  name: ozgcloud-keycloak-operator-write-role
 rules:
   - apiGroups:
       - operator.ozgcloud.de
     resources:
-      - ozgkeycloakusers
-      - ozgkeycloakusers/status
-      - ozgkeycloakusers/finalizers
-      - ozgkeycloakgroups
-      - ozgkeycloakgroups/status
-      - ozgkeycloakgroups/finalizers
-      - ozgkeycloakrealms
-      - ozgkeycloakrealms/status
-      - ozgkeycloakrealms/finalizers
-      - ozgkeycloakclients
-      - ozgkeycloakclients/status
-      - ozgkeycloakclients/finalizers
+      - ozgcloudkeycloakusers
+      - ozgcloudkeycloakusers/status
+      - ozgcloudkeycloakusers/finalizers
+      - ozgcloudkeycloakgroups
+      - ozgcloudkeycloakgroups/status
+      - ozgcloudkeycloakgroups/finalizers
+      - ozgcloudkeycloakrealms
+      - ozgcloudkeycloakrealms/status
+      - ozgcloudkeycloakrealms/finalizers
+      - ozgcloudkeycloakclients
+      - ozgcloudkeycloakclients/status
+      - ozgcloudkeycloakclients/finalizers
     verbs:
       - patch
       - update
\ No newline at end of file
diff --git a/src/main/helm/templates/rbacs/serviceaccount.yaml b/src/main/helm/templates/rbacs/serviceaccount.yaml
index ff35db37800d21c01ba1742395fb57b0fde96553..f9f224ecc844a4042afc49a90066806ccc405981 100644
--- a/src/main/helm/templates/rbacs/serviceaccount.yaml
+++ b/src/main/helm/templates/rbacs/serviceaccount.yaml
@@ -24,5 +24,5 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: ozg-operator-serviceaccount
+  name: ozgcloud-keycloak-operator-serviceaccount
   namespace: {{ .Release.Namespace }}
\ No newline at end of file
diff --git a/src/main/java/de/ozgcloud/operator/keycloak/OzgCustomResourceStatus.java b/src/main/java/de/ozgcloud/operator/keycloak/OzgCloudCustomResourceStatus.java
similarity index 95%
rename from src/main/java/de/ozgcloud/operator/keycloak/OzgCustomResourceStatus.java
rename to src/main/java/de/ozgcloud/operator/keycloak/OzgCloudCustomResourceStatus.java
index c14d87d3b66b0804c94c2c1bfa2c6664a59ea48f..5bbceb5439d6a2d0efe2e5fec604b131c96fa62e 100644
--- a/src/main/java/de/ozgcloud/operator/keycloak/OzgCustomResourceStatus.java
+++ b/src/main/java/de/ozgcloud/operator/keycloak/OzgCloudCustomResourceStatus.java
@@ -23,6 +23,6 @@
  */
 package de.ozgcloud.operator.keycloak;
 
-public enum OzgCustomResourceStatus {
+public enum OzgCloudCustomResourceStatus {
 	OK, IN_PROGRESS, ERROR;
 }
diff --git a/src/main/java/de/ozgcloud/operator/keycloak/client/KeycloakClientMapper.java b/src/main/java/de/ozgcloud/operator/keycloak/client/KeycloakClientMapper.java
index 12cb44954dbfaf4f768aa5ca547bd4b3c4dbc782..ccd1148830e73d59c20a03fe6a5be7c3999ded08 100644
--- a/src/main/java/de/ozgcloud/operator/keycloak/client/KeycloakClientMapper.java
+++ b/src/main/java/de/ozgcloud/operator/keycloak/client/KeycloakClientMapper.java
@@ -49,7 +49,7 @@ interface KeycloakClientMapper {
 	@Mapping(target = "implicitFlowEnabled", constant = "true")
 	@Mapping(target = "bearerOnly", constant = "false")
 	@Mapping(target = "attributes", source = ".", qualifiedByName = "mapAttributes")
-	ClientRepresentation map(OzgKeycloakClientSpec client);
+	ClientRepresentation map(OzgCloudKeycloakClientSpec client);
 
 	@Mapping(target = "protocol", constant = PROTOCOL)
 	@Mapping(target = "publicClient", constant = "true")
@@ -58,17 +58,17 @@ interface KeycloakClientMapper {
 	@Mapping(target = "implicitFlowEnabled", constant = "true")
 	@Mapping(target = "bearerOnly", constant = "false")
 	@Mapping(target = "attributes", source = ".", qualifiedByName = "mapAttributes")
-	ClientRepresentation update(@MappingTarget ClientRepresentation existingClient, OzgKeycloakClientSpec spec);
+	ClientRepresentation update(@MappingTarget ClientRepresentation existingClient, OzgCloudKeycloakClientSpec spec);
 
 	@Named("mapAttributes")
-	default Map<String, String> mapAttributes(OzgKeycloakClientSpec client) {
+	default Map<String, String> mapAttributes(OzgCloudKeycloakClientSpec client) {
 		return Map.of(ATTRIBUTE_NAME_POST_LOGOUT_REDIRECT_URIS, ATTRIBUTE_VALUE_POST_LOGOUT_REDIRECT_URIS);
 	}
 
-	RoleRepresentation mapRole(OzgKeycloakClientSpec.ClientRole spec);
+	RoleRepresentation mapRole(OzgCloudKeycloakClientSpec.ClientRole spec);
 
-	RoleRepresentation updateRole(@MappingTarget RoleRepresentation existingRole, OzgKeycloakClientSpec.ClientRole spec);
+	RoleRepresentation updateRole(@MappingTarget RoleRepresentation existingRole, OzgCloudKeycloakClientSpec.ClientRole spec);
 
 	@Mapping(target = "protocolMapper", source = "type")
-	ProtocolMapperRepresentation mapProtocolMapper(OzgKeycloakClientSpec.ProtocolMapper mapper);
+	ProtocolMapperRepresentation mapProtocolMapper(OzgCloudKeycloakClientSpec.ProtocolMapper mapper);
 }
diff --git a/src/main/java/de/ozgcloud/operator/keycloak/client/KeycloakClientPreconditionService.java b/src/main/java/de/ozgcloud/operator/keycloak/client/KeycloakClientPreconditionService.java
index 10c97431f57c84485d03ad3fe4174bf1f8132aa4..93b4130f0c71831f12c882667e5038c1aebc34e3 100644
--- a/src/main/java/de/ozgcloud/operator/keycloak/client/KeycloakClientPreconditionService.java
+++ b/src/main/java/de/ozgcloud/operator/keycloak/client/KeycloakClientPreconditionService.java
@@ -36,7 +36,7 @@ class KeycloakClientPreconditionService {
 	@Autowired
 	private KeycloakGenericRemoteService keycloakGenericRemoteService;
 
-	Optional<String> getReconcilePreconditionErrors(OzgKeycloakClient resource) {
+	Optional<String> getReconcilePreconditionErrors(OzgCloudKeycloakClient resource) {
 
 		String namespace = resource.getMetadata().getNamespace();
 
diff --git a/src/main/java/de/ozgcloud/operator/keycloak/client/KeycloakClientReconciler.java b/src/main/java/de/ozgcloud/operator/keycloak/client/KeycloakClientReconciler.java
index d20d39870914450f419e3d613fd3b82cd628ccfe..11f4f71bddbd9bbb8f8b9c181a861dd6bd85a75b 100644
--- a/src/main/java/de/ozgcloud/operator/keycloak/client/KeycloakClientReconciler.java
+++ b/src/main/java/de/ozgcloud/operator/keycloak/client/KeycloakClientReconciler.java
@@ -30,7 +30,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import de.ozgcloud.operator.Config;
-import de.ozgcloud.operator.keycloak.OzgCustomResourceStatus;
+import de.ozgcloud.operator.keycloak.OzgCloudCustomResourceStatus;
 import io.javaoperatorsdk.operator.api.reconciler.Context;
 import io.javaoperatorsdk.operator.api.reconciler.ControllerConfiguration;
 import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
@@ -40,7 +40,7 @@ import lombok.extern.java.Log;
 @ControllerConfiguration
 @Component
 @Log
-public class KeycloakClientReconciler implements Reconciler<OzgKeycloakClient> {
+public class KeycloakClientReconciler implements Reconciler<OzgCloudKeycloakClient> {
 
 	@Autowired
 	private KeycloakClientService service;
@@ -49,7 +49,7 @@ public class KeycloakClientReconciler implements Reconciler<OzgKeycloakClient> {
 	private KeycloakClientPreconditionService preconditionService;
 
 	@Override
-	public UpdateControl<OzgKeycloakClient> reconcile(OzgKeycloakClient resource, Context<OzgKeycloakClient> context) {
+	public UpdateControl<OzgCloudKeycloakClient> reconcile(OzgCloudKeycloakClient resource, Context<OzgCloudKeycloakClient> context) {
 
 		try {
 			String crdName = resource.getMetadata().getName();
@@ -69,21 +69,21 @@ public class KeycloakClientReconciler implements Reconciler<OzgKeycloakClient> {
 					"Could not reconcile client " + resource.getMetadata().getName() + " in namespace " + resource.getMetadata().getNamespace() + ": "
 							+ e.getMessage(),
 					e);
-			resource.setStatus(OzgKeycloakClientStatus.builder().status(OzgCustomResourceStatus.ERROR).message(e.getMessage()).build());
+			resource.setStatus(OzgCloudKeycloakClientStatus.builder().status(OzgCloudCustomResourceStatus.ERROR).message(e.getMessage()).build());
 			return UpdateControl.updateStatus(resource).rescheduleAfter(Config.RECONCILER_RETRY_SECONDS);
 		}
 	}
 
-	private UpdateControl<OzgKeycloakClient> buildStatusOk(OzgKeycloakClient resource) {
-		resource.setStatus(OzgKeycloakClientStatus.builder().status(OzgCustomResourceStatus.OK).message(null).build());
+	private UpdateControl<OzgCloudKeycloakClient> buildStatusOk(OzgCloudKeycloakClient resource) {
+		resource.setStatus(OzgCloudKeycloakClientStatus.builder().status(OzgCloudCustomResourceStatus.OK).message(null).build());
 		return UpdateControl.updateStatus(resource);
 	}
 
-	private UpdateControl<OzgKeycloakClient> buildStatusInProgress(OzgKeycloakClient resource, String errorMessage) {
+	private UpdateControl<OzgCloudKeycloakClient> buildStatusInProgress(OzgCloudKeycloakClient resource, String errorMessage) {
 		log.log(Level.INFO,
 				"Could not yet reconcile client " + resource.getMetadata().getName() + " in namespace " + resource.getMetadata().getNamespace() + ":"
 						+ errorMessage);
-		resource.setStatus(OzgKeycloakClientStatus.builder().status(OzgCustomResourceStatus.IN_PROGRESS).message(errorMessage).build());
+		resource.setStatus(OzgCloudKeycloakClientStatus.builder().status(OzgCloudCustomResourceStatus.IN_PROGRESS).message(errorMessage).build());
 		return UpdateControl.updateStatus(resource).rescheduleAfter(Config.RECONCILER_RETRY_SECONDS);
 	}
 }
diff --git a/src/main/java/de/ozgcloud/operator/keycloak/client/KeycloakClientService.java b/src/main/java/de/ozgcloud/operator/keycloak/client/KeycloakClientService.java
index 6cf43aa46500d1b908a5b427fd89339f2cacee94..90e9671841a6e00f29ebc63ff904e8a0c9cb1956 100644
--- a/src/main/java/de/ozgcloud/operator/keycloak/client/KeycloakClientService.java
+++ b/src/main/java/de/ozgcloud/operator/keycloak/client/KeycloakClientService.java
@@ -46,13 +46,13 @@ class KeycloakClientService {
 	@Autowired
 	private KeycloakClientMapper mapper;
 
-	void createOrUpdateClient(OzgKeycloakClientSpec spec, String namespace) {
+	void createOrUpdateClient(OzgCloudKeycloakClientSpec spec, String namespace) {
 		genericRemoteService.getByClientId(spec.getClientId(), namespace)
 				.ifPresentOrElse(existingClient -> updateClient(existingClient, spec, namespace),
 						() -> createClient(spec, namespace));
 	}
 
-	void updateClient(ClientRepresentation existingClient, OzgKeycloakClientSpec spec, String realm) {
+	void updateClient(ClientRepresentation existingClient, OzgCloudKeycloakClientSpec spec, String realm) {
 		var clientRepresentation = mapper.update(existingClient, spec);
 		setProtocolMapper(clientRepresentation);
 		remoteService.updateClient(clientRepresentation, realm);
@@ -60,7 +60,7 @@ class KeycloakClientService {
 		addOrUpdateClientRoles(spec, realm, existingClient.getId());
 	}
 
-	void createClient(OzgKeycloakClientSpec spec, String realm) {
+	void createClient(OzgCloudKeycloakClientSpec spec, String realm) {
 		var clientRepresentation = mapper.map(spec);
 		setProtocolMapper(clientRepresentation);
 		var realClientId = remoteService.createClient(clientRepresentation, realm);
@@ -76,7 +76,7 @@ class KeycloakClientService {
 				mapperRepresentationBuilder.createClientRolesMapper()));
 	}
 
-	void addOrUpdateClientRoles(OzgKeycloakClientSpec spec, String realm, String realClientId) {
+	void addOrUpdateClientRoles(OzgCloudKeycloakClientSpec spec, String realm, String realClientId) {
 		spec.getClientRoles().forEach(
 				roleSpec -> genericRemoteService.getClientRole(roleSpec.getName(), realClientId, realm)
 						.ifPresentOrElse(
diff --git a/src/main/java/de/ozgcloud/operator/keycloak/client/OzgKeycloakClient.java b/src/main/java/de/ozgcloud/operator/keycloak/client/OzgCloudKeycloakClient.java
similarity index 86%
rename from src/main/java/de/ozgcloud/operator/keycloak/client/OzgKeycloakClient.java
rename to src/main/java/de/ozgcloud/operator/keycloak/client/OzgCloudKeycloakClient.java
index b78b340b73f0a44dcbe51906744df7f5aeafce68..82f2cc43efa34c065f146d8472ab1481a09e5a4d 100644
--- a/src/main/java/de/ozgcloud/operator/keycloak/client/OzgKeycloakClient.java
+++ b/src/main/java/de/ozgcloud/operator/keycloak/client/OzgCloudKeycloakClient.java
@@ -31,11 +31,11 @@ import io.fabric8.kubernetes.model.annotation.Plural;
 import io.fabric8.kubernetes.model.annotation.Singular;
 import io.fabric8.kubernetes.model.annotation.Version;
 
-@Kind("OzgKeycloakClient")
+@Kind("OzgCloudKeycloakClient")
 @Group("operator.ozgcloud.de")
 @Version("v1")
-@Singular("ozgkeycloakclient")
-@Plural("ozgkeycloakclients")
+@Singular("ozgcloudkeycloakclient")
+@Plural("ozgcloudkeycloakclients")
 @SuppressWarnings("serial")
-class OzgKeycloakClient extends CustomResource<OzgKeycloakClientSpec, OzgKeycloakClientStatus> implements Namespaced {
+class OzgCloudKeycloakClient extends CustomResource<OzgCloudKeycloakClientSpec, OzgCloudKeycloakClientStatus> implements Namespaced {
 }
diff --git a/src/main/java/de/ozgcloud/operator/keycloak/client/OzgKeycloakClientSpec.java b/src/main/java/de/ozgcloud/operator/keycloak/client/OzgCloudKeycloakClientSpec.java
similarity index 98%
rename from src/main/java/de/ozgcloud/operator/keycloak/client/OzgKeycloakClientSpec.java
rename to src/main/java/de/ozgcloud/operator/keycloak/client/OzgCloudKeycloakClientSpec.java
index e7b8353d9e5eece563ac397ec4a991514b4cb70c..15511d79bc798ac3f6fca96f8f534c6791eeb961 100644
--- a/src/main/java/de/ozgcloud/operator/keycloak/client/OzgKeycloakClientSpec.java
+++ b/src/main/java/de/ozgcloud/operator/keycloak/client/OzgCloudKeycloakClientSpec.java
@@ -42,7 +42,7 @@ import lombok.Setter;
 @NoArgsConstructor
 @AllArgsConstructor
 @JsonIgnoreProperties(ignoreUnknown = true)
-class OzgKeycloakClientSpec {
+class OzgCloudKeycloakClientSpec {
 
 	@JsonProperty("client_name")
 	private String clientId;
diff --git a/src/main/java/de/ozgcloud/operator/keycloak/client/OzgKeycloakClientStatus.java b/src/main/java/de/ozgcloud/operator/keycloak/client/OzgCloudKeycloakClientStatus.java
similarity index 89%
rename from src/main/java/de/ozgcloud/operator/keycloak/client/OzgKeycloakClientStatus.java
rename to src/main/java/de/ozgcloud/operator/keycloak/client/OzgCloudKeycloakClientStatus.java
index d1b00c45244818f4903df04816b1b88344cc8212..327dd2f6329284c1ca14da3b04b5ae5ee1f4595a 100644
--- a/src/main/java/de/ozgcloud/operator/keycloak/client/OzgKeycloakClientStatus.java
+++ b/src/main/java/de/ozgcloud/operator/keycloak/client/OzgCloudKeycloakClientStatus.java
@@ -25,7 +25,7 @@ package de.ozgcloud.operator.keycloak.client;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
-import de.ozgcloud.operator.keycloak.OzgCustomResourceStatus;
+import de.ozgcloud.operator.keycloak.OzgCloudCustomResourceStatus;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
@@ -38,9 +38,9 @@ import lombok.Setter;
 @NoArgsConstructor
 @AllArgsConstructor
 @JsonIgnoreProperties(ignoreUnknown = true)
-class OzgKeycloakClientStatus {
+class OzgCloudKeycloakClientStatus {
 
-	private OzgCustomResourceStatus status;
+	private OzgCloudCustomResourceStatus status;
 
 	private String message;
 }
diff --git a/src/main/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupMapper.java b/src/main/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupMapper.java
index d0dcab2e55b7dded2064544876336dc9c44147b6..519f6617a41e3b3a206e37fc3331958579c69adf 100644
--- a/src/main/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupMapper.java
+++ b/src/main/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupMapper.java
@@ -38,10 +38,10 @@ import org.mapstruct.ReportingPolicy;
 interface KeycloakGroupMapper {
 
 	@Mapping(target = "attributes", source = "attributes", qualifiedByName = "mapAttributes")
-	GroupRepresentation map(OzgKeycloakGroupSpec group);
+	GroupRepresentation map(OzgCloudKeycloakGroupSpec group);
 
 	@Named("mapAttributes")
-	default Map<String, List<String>> mapAttributes(List<OzgKeycloakGroupSpec.Attribute> attributes) {
-		return attributes.stream().collect(Collectors.toMap(OzgKeycloakGroupSpec.Attribute::getName, attribute -> List.of(attribute.getValue())));
+	default Map<String, List<String>> mapAttributes(List<OzgCloudKeycloakGroupSpec.Attribute> attributes) {
+		return attributes.stream().collect(Collectors.toMap(OzgCloudKeycloakGroupSpec.Attribute::getName, attribute -> List.of(attribute.getValue())));
 	}
 }
diff --git a/src/main/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupPreconditionService.java b/src/main/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupPreconditionService.java
index 200a802072d21e989bf00e731f1a588db4fbecd9..0f6571bf732fc8156724b2b52c980f4f18d5be05 100644
--- a/src/main/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupPreconditionService.java
+++ b/src/main/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupPreconditionService.java
@@ -36,7 +36,7 @@ class KeycloakGroupPreconditionService {
 	@Autowired
 	private KeycloakGenericRemoteService keycloakGenericRemoteService;
 
-	Optional<String> getReconcilePreconditionErrors(OzgKeycloakGroup resource) {
+	Optional<String> getReconcilePreconditionErrors(OzgCloudKeycloakGroup resource) {
 
 		String namespace = resource.getMetadata().getNamespace();
 
diff --git a/src/main/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupReconciler.java b/src/main/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupReconciler.java
index 4aeed50e27d5d0af1ddd5d5553d996c43ff86658..7388466efab7780dab2f49aeec1d8ba70af92f47 100644
--- a/src/main/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupReconciler.java
+++ b/src/main/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupReconciler.java
@@ -30,7 +30,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import de.ozgcloud.operator.Config;
-import de.ozgcloud.operator.keycloak.OzgCustomResourceStatus;
+import de.ozgcloud.operator.keycloak.OzgCloudCustomResourceStatus;
 import io.javaoperatorsdk.operator.api.reconciler.Context;
 import io.javaoperatorsdk.operator.api.reconciler.ControllerConfiguration;
 import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
@@ -40,7 +40,7 @@ import lombok.extern.java.Log;
 @ControllerConfiguration
 @Component
 @Log
-public class KeycloakGroupReconciler implements Reconciler<OzgKeycloakGroup> {
+public class KeycloakGroupReconciler implements Reconciler<OzgCloudKeycloakGroup> {
 
 	@Autowired
 	private KeycloakGroupService service;
@@ -49,7 +49,7 @@ public class KeycloakGroupReconciler implements Reconciler<OzgKeycloakGroup> {
 	private KeycloakGroupPreconditionService preconditionService;
 
 	@Override
-	public UpdateControl<OzgKeycloakGroup> reconcile(OzgKeycloakGroup resource, Context<OzgKeycloakGroup> context) {
+	public UpdateControl<OzgCloudKeycloakGroup> reconcile(OzgCloudKeycloakGroup resource, Context<OzgCloudKeycloakGroup> context) {
 
 		try {
 			String crdName = resource.getMetadata().getName();
@@ -69,21 +69,21 @@ public class KeycloakGroupReconciler implements Reconciler<OzgKeycloakGroup> {
 					"Could not reconcile group " + resource.getMetadata().getName() + " in namespace " + resource.getMetadata().getNamespace() + ": "
 							+ e.getMessage(),
 					e);
-			resource.setStatus(OzgKeycloakGroupStatus.builder().status(OzgCustomResourceStatus.ERROR).message(e.getMessage()).build());
+			resource.setStatus(OzgCloudKeycloakGroupStatus.builder().status(OzgCloudCustomResourceStatus.ERROR).message(e.getMessage()).build());
 			return UpdateControl.updateStatus(resource).rescheduleAfter(Config.RECONCILER_RETRY_SECONDS);
 		}
 	}
 
-	UpdateControl<OzgKeycloakGroup> buildStatusOk(OzgKeycloakGroup resource) {
-		resource.setStatus(OzgKeycloakGroupStatus.builder().status(OzgCustomResourceStatus.OK).message(null).build());
+	UpdateControl<OzgCloudKeycloakGroup> buildStatusOk(OzgCloudKeycloakGroup resource) {
+		resource.setStatus(OzgCloudKeycloakGroupStatus.builder().status(OzgCloudCustomResourceStatus.OK).message(null).build());
 		return UpdateControl.updateStatus(resource);
 	}
 
-	UpdateControl<OzgKeycloakGroup> buildStatusInProgress(OzgKeycloakGroup resource, String errorMessage) {
+	UpdateControl<OzgCloudKeycloakGroup> buildStatusInProgress(OzgCloudKeycloakGroup resource, String errorMessage) {
 		log.log(Level.INFO,
 				"Could not yet reconcile group " + resource.getMetadata().getName() + " in namespace " + resource.getMetadata().getNamespace() + ": "
 						+ errorMessage);
-		resource.setStatus(OzgKeycloakGroupStatus.builder().status(OzgCustomResourceStatus.IN_PROGRESS).message(errorMessage).build());
+		resource.setStatus(OzgCloudKeycloakGroupStatus.builder().status(OzgCloudCustomResourceStatus.IN_PROGRESS).message(errorMessage).build());
 		return UpdateControl.updateStatus(resource).rescheduleAfter(Config.RECONCILER_RETRY_SECONDS);
 	}
 }
\ No newline at end of file
diff --git a/src/main/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupService.java b/src/main/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupService.java
index 829e1d2227d896fb07ede308c616378f6ffbfdb7..4eaa2eddbee5b0543f7112a953e0ce6979fe86b3 100644
--- a/src/main/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupService.java
+++ b/src/main/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupService.java
@@ -37,7 +37,7 @@ class KeycloakGroupService {
 	@Autowired
 	private KeycloakGroupMapper mapper;
 
-	void createGroup(OzgKeycloakGroupSpec group, String realm) {
+	void createGroup(OzgCloudKeycloakGroupSpec group, String realm) {
 		Optional.of(group)
 				.map(mapper::map)
 				.filter(groupRepresentation -> remoteService.getGroupByName(group.getName(), realm).isEmpty())
diff --git a/src/main/java/de/ozgcloud/operator/keycloak/group/OzgKeycloakGroup.java b/src/main/java/de/ozgcloud/operator/keycloak/group/OzgCloudKeycloakGroup.java
similarity index 86%
rename from src/main/java/de/ozgcloud/operator/keycloak/group/OzgKeycloakGroup.java
rename to src/main/java/de/ozgcloud/operator/keycloak/group/OzgCloudKeycloakGroup.java
index 4bb0581d4c315f2140c1645d9fb29f70d2cd7012..6d02e4360b94f7f1202eedf523d15e760ed43aa0 100644
--- a/src/main/java/de/ozgcloud/operator/keycloak/group/OzgKeycloakGroup.java
+++ b/src/main/java/de/ozgcloud/operator/keycloak/group/OzgCloudKeycloakGroup.java
@@ -31,12 +31,12 @@ import io.fabric8.kubernetes.model.annotation.Plural;
 import io.fabric8.kubernetes.model.annotation.Singular;
 import io.fabric8.kubernetes.model.annotation.Version;
 
-@Kind("OzgKeycloakGroup")
+@Kind("OzgCloudKeycloakGroup")
 @Group("operator.ozgcloud.de")
 @Version("v1")
-@Singular("ozgkeycloakgroup")
-@Plural("ozgkeycloakgroups")
+@Singular("ozgcloudkeycloakgroup")
+@Plural("ozgcloudkeycloakgroups")
 @SuppressWarnings("serial")
-class OzgKeycloakGroup extends CustomResource<OzgKeycloakGroupSpec, OzgKeycloakGroupStatus> implements Namespaced {
+class OzgCloudKeycloakGroup extends CustomResource<OzgCloudKeycloakGroupSpec, OzgCloudKeycloakGroupStatus> implements Namespaced {
 
 }
diff --git a/src/main/java/de/ozgcloud/operator/keycloak/group/OzgKeycloakGroupSpec.java b/src/main/java/de/ozgcloud/operator/keycloak/group/OzgCloudKeycloakGroupSpec.java
similarity index 98%
rename from src/main/java/de/ozgcloud/operator/keycloak/group/OzgKeycloakGroupSpec.java
rename to src/main/java/de/ozgcloud/operator/keycloak/group/OzgCloudKeycloakGroupSpec.java
index 43ac4bef38ef7d5f69b5d0ccdebaf0a16e0dd817..8b199613512bf857f2385ee4da50d7f7150f544d 100644
--- a/src/main/java/de/ozgcloud/operator/keycloak/group/OzgKeycloakGroupSpec.java
+++ b/src/main/java/de/ozgcloud/operator/keycloak/group/OzgCloudKeycloakGroupSpec.java
@@ -40,7 +40,7 @@ import lombok.Setter;
 @NoArgsConstructor
 @AllArgsConstructor
 @JsonIgnoreProperties(ignoreUnknown = true)
-class OzgKeycloakGroupSpec {
+class OzgCloudKeycloakGroupSpec {
 
 	@JsonProperty("group_name")
 	private String name;
diff --git a/src/main/java/de/ozgcloud/operator/keycloak/group/OzgKeycloakGroupStatus.java b/src/main/java/de/ozgcloud/operator/keycloak/group/OzgCloudKeycloakGroupStatus.java
similarity index 90%
rename from src/main/java/de/ozgcloud/operator/keycloak/group/OzgKeycloakGroupStatus.java
rename to src/main/java/de/ozgcloud/operator/keycloak/group/OzgCloudKeycloakGroupStatus.java
index 6dcc30eb1606310f7ba8e45996654c4fe07395bb..4bc4b777189f7e121980ce15e7a4d7a76b58473e 100644
--- a/src/main/java/de/ozgcloud/operator/keycloak/group/OzgKeycloakGroupStatus.java
+++ b/src/main/java/de/ozgcloud/operator/keycloak/group/OzgCloudKeycloakGroupStatus.java
@@ -25,7 +25,7 @@ package de.ozgcloud.operator.keycloak.group;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
-import de.ozgcloud.operator.keycloak.OzgCustomResourceStatus;
+import de.ozgcloud.operator.keycloak.OzgCloudCustomResourceStatus;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
@@ -38,9 +38,9 @@ import lombok.Setter;
 @NoArgsConstructor
 @AllArgsConstructor
 @JsonIgnoreProperties(ignoreUnknown = true)
-class OzgKeycloakGroupStatus {
+class OzgCloudKeycloakGroupStatus {
 
-	private OzgCustomResourceStatus status;
+	private OzgCloudCustomResourceStatus status;
 
 	private String message;
 }
diff --git a/src/main/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmMapper.java b/src/main/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmMapper.java
index faa2bb152793d34db97836b40b71a6299f28047b..8b5e7bebf74cfe94492a642ad13b98bb22f31bdd 100644
--- a/src/main/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmMapper.java
+++ b/src/main/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmMapper.java
@@ -41,10 +41,10 @@ interface KeycloakRealmMapper {
 	@Mapping(target = "defaultLocale", constant = "de")
 	@Mapping(target = "internationalizationEnabled", constant = "true")
 	@Mapping(target = "passwordPolicy", constant = "upperCase(1) and lowerCase(1) and length(8) and notUsername")
-	RealmRepresentation map(OzgKeycloakRealmSpec realm);
+	RealmRepresentation map(OzgCloudKeycloakRealmSpec realm);
 
 	@Named("supportedLocales")
-	default Set<String> mapPassword(OzgKeycloakRealmSpec spec) {
+	default Set<String> mapPassword(OzgCloudKeycloakRealmSpec spec) {
 		return Set.of("de");
 	}
 }
diff --git a/src/main/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmReconciler.java b/src/main/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmReconciler.java
index 961a6dd15eec9c6342ea4bb206fb5ddde33d95c2..4b62b2b7b131a179f96330657e862b6e6aecf690 100644
--- a/src/main/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmReconciler.java
+++ b/src/main/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmReconciler.java
@@ -29,7 +29,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import de.ozgcloud.operator.Config;
-import de.ozgcloud.operator.keycloak.OzgCustomResourceStatus;
+import de.ozgcloud.operator.keycloak.OzgCloudCustomResourceStatus;
 import io.javaoperatorsdk.operator.api.reconciler.Cleaner;
 import io.javaoperatorsdk.operator.api.reconciler.Context;
 import io.javaoperatorsdk.operator.api.reconciler.ControllerConfiguration;
@@ -41,13 +41,13 @@ import lombok.extern.java.Log;
 @ControllerConfiguration
 @Component
 @Log
-public class KeycloakRealmReconciler implements Reconciler<OzgKeycloakRealm>, Cleaner<OzgKeycloakRealm> {
+public class KeycloakRealmReconciler implements Reconciler<OzgCloudKeycloakRealm>, Cleaner<OzgCloudKeycloakRealm> {
 
 	@Autowired
 	private KeycloakRealmService service;
 
 	@Override
-	public UpdateControl<OzgKeycloakRealm> reconcile(OzgKeycloakRealm resource, Context<OzgKeycloakRealm> context) {
+	public UpdateControl<OzgCloudKeycloakRealm> reconcile(OzgCloudKeycloakRealm resource, Context<OzgCloudKeycloakRealm> context) {
 		log.info("Realm reconciler reconcile, keep after delete is set to: " + resource.getSpec().isKeepAfterDelete());
 		try {
 			String realmName = resource.getMetadata().getNamespace();
@@ -56,7 +56,7 @@ public class KeycloakRealmReconciler implements Reconciler<OzgKeycloakRealm>, Cl
 
 			service.createRealm(resource.getSpec(), realmName);
 
-			resource.setStatus(OzgKeycloakRealmStatus.builder().status(OzgCustomResourceStatus.OK).message(null).build());
+			resource.setStatus(OzgCloudKeycloakRealmStatus.builder().status(OzgCloudCustomResourceStatus.OK).message(null).build());
 			return UpdateControl.updateStatus(resource);
 
 		} catch (Exception e) {
@@ -64,13 +64,13 @@ public class KeycloakRealmReconciler implements Reconciler<OzgKeycloakRealm>, Cl
 					"Could not reconcile realm " + resource.getMetadata().getName() + " in namespace " + resource.getMetadata().getNamespace() + ": "
 							+ e.getMessage(),
 					e);
-			resource.setStatus(OzgKeycloakRealmStatus.builder().status(OzgCustomResourceStatus.ERROR).message(e.getMessage()).build());
+			resource.setStatus(OzgCloudKeycloakRealmStatus.builder().status(OzgCloudCustomResourceStatus.ERROR).message(e.getMessage()).build());
 			return UpdateControl.updateStatus(resource).rescheduleAfter(Config.RECONCILER_RETRY_SECONDS);
 		}
 	}
 
 	@Override
-	public DeleteControl cleanup(OzgKeycloakRealm realm, Context<OzgKeycloakRealm> context) {
+	public DeleteControl cleanup(OzgCloudKeycloakRealm realm, Context<OzgCloudKeycloakRealm> context) {
 		log.info("Realm reconciler cleanup, keep after delete is set to: " + realm.getSpec().isKeepAfterDelete());
 		if (realm.getSpec().isKeepAfterDelete()) {
 			return DeleteControl.defaultDelete();
@@ -78,7 +78,7 @@ public class KeycloakRealmReconciler implements Reconciler<OzgKeycloakRealm>, Cl
 		return cleanup(realm);
 	}
 
-	DeleteControl cleanup(OzgKeycloakRealm realm) {
+	DeleteControl cleanup(OzgCloudKeycloakRealm realm) {
 		var realmName = realm.getMetadata().getNamespace();
 		log.info("Deleting KeycloakRealm " + realmName);
 		try {
diff --git a/src/main/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmService.java b/src/main/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmService.java
index d6d69c3bcf2c945d63ecdc35fb4e2ec4b73ec6a0..6911ce510d6ff3187f86de6bf94794abb7c3e05e 100644
--- a/src/main/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmService.java
+++ b/src/main/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmService.java
@@ -43,7 +43,7 @@ class KeycloakRealmService {
 	@Autowired
 	private KeycloakGenericRemoteService keycloakGenericRemoteService;
 
-	void createRealm(OzgKeycloakRealmSpec realm, String realmName) {
+	void createRealm(OzgCloudKeycloakRealmSpec realm, String realmName) {
 		Optional.of(realm)
 				.map(mapper::map)
 				.map(realmRepresentation -> addRealmName(realmRepresentation, realmName))
diff --git a/src/main/java/de/ozgcloud/operator/keycloak/realm/OzgKeycloakRealm.java b/src/main/java/de/ozgcloud/operator/keycloak/realm/OzgCloudKeycloakRealm.java
similarity index 86%
rename from src/main/java/de/ozgcloud/operator/keycloak/realm/OzgKeycloakRealm.java
rename to src/main/java/de/ozgcloud/operator/keycloak/realm/OzgCloudKeycloakRealm.java
index 5eacceada9f545616e9e1037d4935745a1d7ad0b..87bb67a91ba89f3e15930c497bef865328556905 100644
--- a/src/main/java/de/ozgcloud/operator/keycloak/realm/OzgKeycloakRealm.java
+++ b/src/main/java/de/ozgcloud/operator/keycloak/realm/OzgCloudKeycloakRealm.java
@@ -31,11 +31,11 @@ import io.fabric8.kubernetes.model.annotation.Plural;
 import io.fabric8.kubernetes.model.annotation.Singular;
 import io.fabric8.kubernetes.model.annotation.Version;
 
-@Kind("OzgKeycloakRealm")
+@Kind("OzgCloudKeycloakRealm")
 @Group("operator.ozgcloud.de")
 @Version("v1")
-@Singular("ozgkeycloakrealm")
-@Plural("ozgkeycloakrealms")
+@Singular("ozgcloudkeycloakrealm")
+@Plural("ozgcloudkeycloakrealms")
 @SuppressWarnings("serial")
-class OzgKeycloakRealm extends CustomResource<OzgKeycloakRealmSpec, OzgKeycloakRealmStatus> implements Namespaced {
+class OzgCloudKeycloakRealm extends CustomResource<OzgCloudKeycloakRealmSpec, OzgCloudKeycloakRealmStatus> implements Namespaced {
 }
diff --git a/src/main/java/de/ozgcloud/operator/keycloak/realm/OzgKeycloakRealmSpec.java b/src/main/java/de/ozgcloud/operator/keycloak/realm/OzgCloudKeycloakRealmSpec.java
similarity index 97%
rename from src/main/java/de/ozgcloud/operator/keycloak/realm/OzgKeycloakRealmSpec.java
rename to src/main/java/de/ozgcloud/operator/keycloak/realm/OzgCloudKeycloakRealmSpec.java
index a3cd548780de7a5f7d6ab934fe100b6f5a4fa4de..0a23abfd2ed15f8744855b5e8d0bc406913b2fd5 100644
--- a/src/main/java/de/ozgcloud/operator/keycloak/realm/OzgKeycloakRealmSpec.java
+++ b/src/main/java/de/ozgcloud/operator/keycloak/realm/OzgCloudKeycloakRealmSpec.java
@@ -38,7 +38,7 @@ import lombok.Setter;
 @NoArgsConstructor
 @AllArgsConstructor
 @JsonIgnoreProperties(ignoreUnknown = true)
-class OzgKeycloakRealmSpec {
+class OzgCloudKeycloakRealmSpec {
 
 	@JsonProperty("keep_after_delete")
 	private boolean keepAfterDelete;
diff --git a/src/main/java/de/ozgcloud/operator/keycloak/realm/OzgKeycloakRealmStatus.java b/src/main/java/de/ozgcloud/operator/keycloak/realm/OzgCloudKeycloakRealmStatus.java
similarity index 90%
rename from src/main/java/de/ozgcloud/operator/keycloak/realm/OzgKeycloakRealmStatus.java
rename to src/main/java/de/ozgcloud/operator/keycloak/realm/OzgCloudKeycloakRealmStatus.java
index d434199b5fb41c473e8618e32e1e1eb5b4f4e095..99410383241f15b0c12711f8684819cd184e5385 100644
--- a/src/main/java/de/ozgcloud/operator/keycloak/realm/OzgKeycloakRealmStatus.java
+++ b/src/main/java/de/ozgcloud/operator/keycloak/realm/OzgCloudKeycloakRealmStatus.java
@@ -25,7 +25,7 @@ package de.ozgcloud.operator.keycloak.realm;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
-import de.ozgcloud.operator.keycloak.OzgCustomResourceStatus;
+import de.ozgcloud.operator.keycloak.OzgCloudCustomResourceStatus;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
@@ -38,9 +38,9 @@ import lombok.Setter;
 @NoArgsConstructor
 @AllArgsConstructor
 @JsonIgnoreProperties(ignoreUnknown = true)
-class OzgKeycloakRealmStatus {
+class OzgCloudKeycloakRealmStatus {
 
-	private OzgCustomResourceStatus status;
+	private OzgCloudCustomResourceStatus status;
 
 	private String message;
 }
diff --git a/src/main/java/de/ozgcloud/operator/keycloak/user/KeycloakUserMapper.java b/src/main/java/de/ozgcloud/operator/keycloak/user/KeycloakUserMapper.java
index adf5f3419c6afffbf20e1ce105717005167648fc..6525186094e659fac93a19a22ab9d620d88927aa 100644
--- a/src/main/java/de/ozgcloud/operator/keycloak/user/KeycloakUserMapper.java
+++ b/src/main/java/de/ozgcloud/operator/keycloak/user/KeycloakUserMapper.java
@@ -36,8 +36,8 @@ import org.mapstruct.MappingTarget;
 import org.mapstruct.Named;
 import org.mapstruct.ReportingPolicy;
 
-import de.ozgcloud.operator.keycloak.user.OzgKeycloakUserSpec.KeycloakUserSpecClientRole;
-import de.ozgcloud.operator.keycloak.user.OzgKeycloakUserSpec.KeycloakUserSpecUserGroup;
+import de.ozgcloud.operator.keycloak.user.OzgCloudKeycloakUserSpec.KeycloakUserSpecClientRole;
+import de.ozgcloud.operator.keycloak.user.OzgCloudKeycloakUserSpec.KeycloakUserSpecUserGroup;
 
 @Mapper(unmappedTargetPolicy = ReportingPolicy.IGNORE, unmappedSourcePolicy = ReportingPolicy.IGNORE, collectionMappingStrategy = CollectionMappingStrategy.ACCESSOR_ONLY)
 interface KeycloakUserMapper {
@@ -51,7 +51,7 @@ interface KeycloakUserMapper {
 	@Mapping(target = "username", source = "keycloakUser.username")
 	@Mapping(target = "firstName", source = "keycloakUser.firstName")
 	@Mapping(target = "lastName", source = "keycloakUser.lastName")
-	UserRepresentation map(OzgKeycloakUserSpec user);
+	UserRepresentation map(OzgCloudKeycloakUserSpec user);
 
 	@Mapping(target = "clientRoles", source = "keycloakUser.clientRoles", qualifiedByName = "mapClientRoles")
 	@Mapping(target = "credentials", source = ".", qualifiedByName = "mapPassword")
@@ -62,14 +62,14 @@ interface KeycloakUserMapper {
 	@Mapping(target = "username", source = "keycloakUser.username")
 	@Mapping(target = "firstName", source = "keycloakUser.firstName")
 	@Mapping(target = "lastName", source = "keycloakUser.lastName")
-	UserRepresentation update(@MappingTarget UserRepresentation userRepresentation, OzgKeycloakUserSpec userSpec);
+	UserRepresentation update(@MappingTarget UserRepresentation userRepresentation, OzgCloudKeycloakUserSpec userSpec);
 
 	@Named("mapPassword")
-	default List<CredentialRepresentation> mapPassword(OzgKeycloakUserSpec user) {
+	default List<CredentialRepresentation> mapPassword(OzgCloudKeycloakUserSpec user) {
 		return List.of(buildPasswordCredential(user));
 	}
 
-	private CredentialRepresentation buildPasswordCredential(OzgKeycloakUserSpec user) {
+	private CredentialRepresentation buildPasswordCredential(OzgCloudKeycloakUserSpec user) {
 		var credential = new CredentialRepresentation();
 		credential.setType(CredentialRepresentation.PASSWORD);
 		credential.setValue(user.getKeycloakUser().getPassword());
@@ -84,7 +84,7 @@ interface KeycloakUserMapper {
 	}
 
 	@Named("mapClientRoles")
-	default Map<String, List<String>> mapClientRoles(List<OzgKeycloakUserSpec.KeycloakUserSpecClientRole> clientRoles) {
+	default Map<String, List<String>> mapClientRoles(List<OzgCloudKeycloakUserSpec.KeycloakUserSpecClientRole> clientRoles) {
 		return clientRoles.stream()
 				.collect(Collectors.groupingBy(KeycloakUserSpecClientRole::getClientId,
 						Collectors.mapping(KeycloakUserSpecClientRole::getRoleName, Collectors.toList())));
diff --git a/src/main/java/de/ozgcloud/operator/keycloak/user/KeycloakUserPreconditionService.java b/src/main/java/de/ozgcloud/operator/keycloak/user/KeycloakUserPreconditionService.java
index 3eaf6c5e688bb94192dd5733df0ac7ff9d240970..6366465994d50b5f7f97acf82baa6c65e6135ba8 100644
--- a/src/main/java/de/ozgcloud/operator/keycloak/user/KeycloakUserPreconditionService.java
+++ b/src/main/java/de/ozgcloud/operator/keycloak/user/KeycloakUserPreconditionService.java
@@ -29,8 +29,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import de.ozgcloud.operator.keycloak.KeycloakGenericRemoteService;
-import de.ozgcloud.operator.keycloak.user.OzgKeycloakUserSpec.KeycloakUserSpecClientRole;
-import de.ozgcloud.operator.keycloak.user.OzgKeycloakUserSpec.KeycloakUserSpecUserGroup;
+import de.ozgcloud.operator.keycloak.user.OzgCloudKeycloakUserSpec.KeycloakUserSpecClientRole;
+import de.ozgcloud.operator.keycloak.user.OzgCloudKeycloakUserSpec.KeycloakUserSpecUserGroup;
 
 @Component
 class KeycloakUserPreconditionService {
@@ -38,7 +38,7 @@ class KeycloakUserPreconditionService {
 	@Autowired
 	private KeycloakGenericRemoteService keycloakGenericRemoteService;
 
-	public Optional<String> getPreconditionErrors(OzgKeycloakUser user) {
+	public Optional<String> getPreconditionErrors(OzgCloudKeycloakUser user) {
 		var namespace = user.getMetadata().getNamespace();
 
 		if (!keycloakGenericRemoteService.realmExists(namespace)) {
@@ -58,7 +58,7 @@ class KeycloakUserPreconditionService {
 		return Optional.empty();
 	}
 
-	Optional<String> clientsExists(OzgKeycloakUser user, String realm) {
+	Optional<String> clientsExists(OzgCloudKeycloakUser user, String realm) {
 		return user.getSpec().getKeycloakUser().getClientRoles().stream()
 				.map(KeycloakUserSpecClientRole::getClientId)
 				.map(clientId -> keycloakGenericRemoteService.getByClientId(clientId, realm))
@@ -67,7 +67,7 @@ class KeycloakUserPreconditionService {
 				.findAny();
 	}
 
-	Optional<String> groupsExists(OzgKeycloakUser user, String realm) {
+	Optional<String> groupsExists(OzgCloudKeycloakUser user, String realm) {
 		return user.getSpec().getKeycloakUser().getGroups().stream()
 				.map(KeycloakUserSpecUserGroup::getName)
 				.filter(groupName -> !keycloakGenericRemoteService.groupExists(groupName, realm))
diff --git a/src/main/java/de/ozgcloud/operator/keycloak/user/KeycloakUserReconciler.java b/src/main/java/de/ozgcloud/operator/keycloak/user/KeycloakUserReconciler.java
index 51db00ed9ac6c24145ad01e3d8e177f2e08ec5f8..26aab3f7af098cadf48b91ee7a828a852642543d 100644
--- a/src/main/java/de/ozgcloud/operator/keycloak/user/KeycloakUserReconciler.java
+++ b/src/main/java/de/ozgcloud/operator/keycloak/user/KeycloakUserReconciler.java
@@ -31,7 +31,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import de.ozgcloud.operator.Config;
-import de.ozgcloud.operator.keycloak.OzgCustomResourceStatus;
+import de.ozgcloud.operator.keycloak.OzgCloudCustomResourceStatus;
 import io.javaoperatorsdk.operator.api.reconciler.Cleaner;
 import io.javaoperatorsdk.operator.api.reconciler.Context;
 import io.javaoperatorsdk.operator.api.reconciler.ControllerConfiguration;
@@ -43,7 +43,7 @@ import lombok.extern.java.Log;
 @Log
 @ControllerConfiguration
 @Component
-public class KeycloakUserReconciler implements Reconciler<OzgKeycloakUser>, Cleaner<OzgKeycloakUser> {
+public class KeycloakUserReconciler implements Reconciler<OzgCloudKeycloakUser>, Cleaner<OzgCloudKeycloakUser> {
 
 	@Autowired
 	private KeycloakUserService service;
@@ -51,7 +51,7 @@ public class KeycloakUserReconciler implements Reconciler<OzgKeycloakUser>, Clea
 	private KeycloakUserPreconditionService preconditionService;
 
 	@Override
-	public UpdateControl<OzgKeycloakUser> reconcile(OzgKeycloakUser resource, Context<OzgKeycloakUser> context) {
+	public UpdateControl<OzgCloudKeycloakUser> reconcile(OzgCloudKeycloakUser resource, Context<OzgCloudKeycloakUser> context) {
 		var userName = resource.getMetadata().getName();
 		var namespace = resource.getMetadata().getNamespace();
 
@@ -66,7 +66,7 @@ public class KeycloakUserReconciler implements Reconciler<OzgKeycloakUser>, Clea
 				log.warning(String.format("Could not reconcile user %s in namespace %s: %s", userName, namespace, errorMessage));
 
 				return UserUpdateControlBuilder.fromResource(resource)
-						.withStatus(OzgCustomResourceStatus.IN_PROGRESS)
+						.withStatus(OzgCloudCustomResourceStatus.IN_PROGRESS)
 						.withMessage(errorMessage)
 						.withReschedule(Config.RECONCILER_RETRY_SECONDS)
 						.build();
@@ -74,7 +74,7 @@ public class KeycloakUserReconciler implements Reconciler<OzgKeycloakUser>, Clea
 
 			service.createOrUpdateUser(resource.getSpec(), namespace);
 
-			return UserUpdateControlBuilder.fromResource(resource).withStatus(OzgCustomResourceStatus.OK).build();
+			return UserUpdateControlBuilder.fromResource(resource).withStatus(OzgCloudCustomResourceStatus.OK).build();
 
 		} catch (Exception e) {
 			var errorMessage = e.getMessage();
@@ -82,7 +82,7 @@ public class KeycloakUserReconciler implements Reconciler<OzgKeycloakUser>, Clea
 			log.log(Level.SEVERE, String.format("Could not reconcile user %s for namespace %s: %s", userName, namespace, errorMessage), e);
 
 			return UserUpdateControlBuilder.fromResource(resource)
-					.withStatus(OzgCustomResourceStatus.ERROR)
+					.withStatus(OzgCloudCustomResourceStatus.ERROR)
 					.withMessage(errorMessage)
 					.withReschedule(Config.RECONCILER_RETRY_SECONDS_ON_ERROR)
 					.build();
@@ -90,7 +90,7 @@ public class KeycloakUserReconciler implements Reconciler<OzgKeycloakUser>, Clea
 	}
 
 	@Override
-	public DeleteControl cleanup(OzgKeycloakUser user, Context<OzgKeycloakUser> context) {
+	public DeleteControl cleanup(OzgCloudKeycloakUser user, Context<OzgCloudKeycloakUser> context) {
 		log.info("User reconciler cleanup, keep after delete is set to: " + user.getSpec().isKeepAfterDelete());
 		if (user.getSpec().isKeepAfterDelete()) {
 			return DeleteControl.defaultDelete();
@@ -98,7 +98,7 @@ public class KeycloakUserReconciler implements Reconciler<OzgKeycloakUser>, Clea
 		return cleanup(user);
 	}
 
-	DeleteControl cleanup(OzgKeycloakUser user) {
+	DeleteControl cleanup(OzgCloudKeycloakUser user) {
 		var userName = user.getMetadata().getName();
 		var namespace = user.getMetadata().getNamespace();
 		log.info(String.format("Deleting KeycloakUser %s", userName));
diff --git a/src/main/java/de/ozgcloud/operator/keycloak/user/KeycloakUserService.java b/src/main/java/de/ozgcloud/operator/keycloak/user/KeycloakUserService.java
index e1db8b21157e6a7252b493011127dd603819afed..13e2cb942453183040d56a1cc07b7d2127d9eae3 100644
--- a/src/main/java/de/ozgcloud/operator/keycloak/user/KeycloakUserService.java
+++ b/src/main/java/de/ozgcloud/operator/keycloak/user/KeycloakUserService.java
@@ -41,7 +41,7 @@ class KeycloakUserService {
 	@Autowired
 	private KeycloakUserMapper userMapper;
 
-	public void createOrUpdateUser(OzgKeycloakUserSpec userSpec, String namespace) {
+	public void createOrUpdateUser(OzgCloudKeycloakUserSpec userSpec, String namespace) {
 
 		if (userHasNoPassword(userSpec, namespace)) {
 			var secret = userSecretService.getOrCreateClusterSecret(userSpec, namespace);
@@ -53,11 +53,11 @@ class KeycloakUserService {
 						() -> remoteService.createUser(userMapper.map(userSpec), namespace));
 	}
 
-	boolean userHasNoPassword(OzgKeycloakUserSpec userSpec, String namespace) {
+	boolean userHasNoPassword(OzgCloudKeycloakUserSpec userSpec, String namespace) {
 		return StringUtils.isEmpty(userSpec.getKeycloakUser().getPassword());
 	}
 
-	public void deleteUser(OzgKeycloakUserSpec userSpec, String namespace) {
+	public void deleteUser(OzgCloudKeycloakUserSpec userSpec, String namespace) {
 		Optional.of(userSpec)
 				.map(userMapper::map)
 				.flatMap(keycloakUser -> remoteService.getUserByName(keycloakUser.getUsername(), namespace))
diff --git a/src/main/java/de/ozgcloud/operator/keycloak/user/OzgKeycloakUser.java b/src/main/java/de/ozgcloud/operator/keycloak/user/OzgCloudKeycloakUser.java
similarity index 86%
rename from src/main/java/de/ozgcloud/operator/keycloak/user/OzgKeycloakUser.java
rename to src/main/java/de/ozgcloud/operator/keycloak/user/OzgCloudKeycloakUser.java
index 3b553c2e6f0afcd7a0bc7af2757644f1ba5ef921..902762d09538f329988064952eeece2cebf4a9b3 100644
--- a/src/main/java/de/ozgcloud/operator/keycloak/user/OzgKeycloakUser.java
+++ b/src/main/java/de/ozgcloud/operator/keycloak/user/OzgCloudKeycloakUser.java
@@ -31,11 +31,11 @@ import io.fabric8.kubernetes.model.annotation.Plural;
 import io.fabric8.kubernetes.model.annotation.Singular;
 import io.fabric8.kubernetes.model.annotation.Version;
 
-@Kind("OzgKeycloakUser")
+@Kind("OzgCloudKeycloakUser")
 @Group("operator.ozgcloud.de")
 @Version("v1")
-@Singular("ozgkeycloakuser")
-@Plural("ozgkeycloakusers")
+@Singular("ozgcloudkeycloakuser")
+@Plural("ozgcloudkeycloakusers")
 @SuppressWarnings("serial")
-class OzgKeycloakUser extends CustomResource<OzgKeycloakUserSpec, OzgKeycloakUserStatus> implements Namespaced {
+class OzgCloudKeycloakUser extends CustomResource<OzgCloudKeycloakUserSpec, OzgCloudKeycloakUserStatus> implements Namespaced {
 }
diff --git a/src/main/java/de/ozgcloud/operator/keycloak/user/OzgKeycloakUserSpec.java b/src/main/java/de/ozgcloud/operator/keycloak/user/OzgCloudKeycloakUserSpec.java
similarity index 98%
rename from src/main/java/de/ozgcloud/operator/keycloak/user/OzgKeycloakUserSpec.java
rename to src/main/java/de/ozgcloud/operator/keycloak/user/OzgCloudKeycloakUserSpec.java
index d42807f5eea7a48bb368fcbc96c2826356e7d2a4..f6cf222c1c71eae502b81bc983fad6cd0249e559 100644
--- a/src/main/java/de/ozgcloud/operator/keycloak/user/OzgKeycloakUserSpec.java
+++ b/src/main/java/de/ozgcloud/operator/keycloak/user/OzgCloudKeycloakUserSpec.java
@@ -43,7 +43,7 @@ import lombok.Setter;
 @NoArgsConstructor
 @AllArgsConstructor
 @JsonIgnoreProperties(ignoreUnknown = true)
-class OzgKeycloakUserSpec {
+class OzgCloudKeycloakUserSpec {
 
 	@JsonProperty("keep_after_delete")
 	private boolean keepAfterDelete;
diff --git a/src/main/java/de/ozgcloud/operator/keycloak/user/OzgKeycloakUserStatus.java b/src/main/java/de/ozgcloud/operator/keycloak/user/OzgCloudKeycloakUserStatus.java
similarity index 88%
rename from src/main/java/de/ozgcloud/operator/keycloak/user/OzgKeycloakUserStatus.java
rename to src/main/java/de/ozgcloud/operator/keycloak/user/OzgCloudKeycloakUserStatus.java
index ee04b9944d0527bc216eadc105d565037318c6c8..0144a03c63ea0c4712f9a15a2f99a2ea9c60940d 100644
--- a/src/main/java/de/ozgcloud/operator/keycloak/user/OzgKeycloakUserStatus.java
+++ b/src/main/java/de/ozgcloud/operator/keycloak/user/OzgCloudKeycloakUserStatus.java
@@ -25,7 +25,7 @@ package de.ozgcloud.operator.keycloak.user;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
-import de.ozgcloud.operator.keycloak.OzgCustomResourceStatus;
+import de.ozgcloud.operator.keycloak.OzgCloudCustomResourceStatus;
 import io.javaoperatorsdk.operator.api.ObservedGenerationAwareStatus;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -39,9 +39,9 @@ import lombok.Setter;
 @NoArgsConstructor
 @AllArgsConstructor
 @JsonIgnoreProperties(ignoreUnknown = true)
-class OzgKeycloakUserStatus extends ObservedGenerationAwareStatus {
+class OzgCloudKeycloakUserStatus extends ObservedGenerationAwareStatus {
 
-	private OzgCustomResourceStatus status;
+	private OzgCloudCustomResourceStatus status;
 
 	private String message;
 }
diff --git a/src/main/java/de/ozgcloud/operator/keycloak/user/UserNameConverter.java b/src/main/java/de/ozgcloud/operator/keycloak/user/UserNameConverter.java
index fee155b2ba5aa1807138d43338786a46780bd3d2..34dc2b66257060ffc76ef7007546fefd7b922a8f 100644
--- a/src/main/java/de/ozgcloud/operator/keycloak/user/UserNameConverter.java
+++ b/src/main/java/de/ozgcloud/operator/keycloak/user/UserNameConverter.java
@@ -3,7 +3,7 @@ package de.ozgcloud.operator.keycloak.user;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 
-import de.ozgcloud.operator.keycloak.user.OzgKeycloakUserSpec.KeycloakUserSpecUser;
+import de.ozgcloud.operator.keycloak.user.OzgCloudKeycloakUserSpec.KeycloakUserSpecUser;
 
 @Component
 class UserNameConverter {
diff --git a/src/main/java/de/ozgcloud/operator/keycloak/user/UserSecretBuilder.java b/src/main/java/de/ozgcloud/operator/keycloak/user/UserSecretBuilder.java
index 0236edf9496b898a340d9629f0894b0d190b5006..e72f995476d93e663608c0152cbffb56908a3043 100644
--- a/src/main/java/de/ozgcloud/operator/keycloak/user/UserSecretBuilder.java
+++ b/src/main/java/de/ozgcloud/operator/keycloak/user/UserSecretBuilder.java
@@ -3,7 +3,7 @@ package de.ozgcloud.operator.keycloak.user;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.springframework.stereotype.Component;
 
-import de.ozgcloud.operator.keycloak.user.OzgKeycloakUserSpec.KeycloakUserSpecUser;
+import de.ozgcloud.operator.keycloak.user.OzgCloudKeycloakUserSpec.KeycloakUserSpecUser;
 import io.fabric8.kubernetes.api.model.ObjectMeta;
 import io.fabric8.kubernetes.api.model.Secret;
 import io.fabric8.kubernetes.api.model.SecretBuilder;
diff --git a/src/main/java/de/ozgcloud/operator/keycloak/user/UserSecretService.java b/src/main/java/de/ozgcloud/operator/keycloak/user/UserSecretService.java
index 458cd8b16fdcf973794d224a8090c3809072b2e4..23bab6cdf8a741a590a5a17c3485922046efeacf 100644
--- a/src/main/java/de/ozgcloud/operator/keycloak/user/UserSecretService.java
+++ b/src/main/java/de/ozgcloud/operator/keycloak/user/UserSecretService.java
@@ -21,7 +21,7 @@ class UserSecretService {
 	@Autowired
 	private KubernetesRemoteService kubernetesRemoteService;
 
-	public Secret create(OzgKeycloakUserSpec userSpec, String namespace) {
+	public Secret create(OzgCloudKeycloakUserSpec userSpec, String namespace) {
 		var secretName = userNameConverter.toSecretName(userSpec.getKeycloakUser());
 
 		var credentialsSecret = secretBuilder.build(secretName, userSpec.getKeycloakUser(), namespace);
@@ -36,7 +36,7 @@ class UserSecretService {
 		return new ResourceAdapter<>(secretResource);
 	}
 
-	Resource<Secret> getUserSecret(OzgKeycloakUserSpec userSpec, String namespace) {
+	Resource<Secret> getUserSecret(OzgCloudKeycloakUserSpec userSpec, String namespace) {
 		var secretName = userNameConverter.toSecretName(userSpec.getKeycloakUser());
 
 		return kubernetesRemoteService.getSecret(namespace, secretName);
@@ -46,7 +46,7 @@ class UserSecretService {
 		return secretReader.getPasswortFromSecret(secret);
 	}
 
-	public Secret getOrCreateClusterSecret(OzgKeycloakUserSpec userSpec, String namespace) {
+	public Secret getOrCreateClusterSecret(OzgCloudKeycloakUserSpec userSpec, String namespace) {
 		return Optional.ofNullable(getUserSecret(userSpec, namespace)).map(Resource::get)
 				.orElseGet(() -> create(userSpec, namespace));
 	}
diff --git a/src/main/java/de/ozgcloud/operator/keycloak/user/UserUpdateControlBuilder.java b/src/main/java/de/ozgcloud/operator/keycloak/user/UserUpdateControlBuilder.java
index 3b7ff063627c961b0065688716533094935d45f9..64b0c931f6764bbb8121779ebe66b937b2854621 100644
--- a/src/main/java/de/ozgcloud/operator/keycloak/user/UserUpdateControlBuilder.java
+++ b/src/main/java/de/ozgcloud/operator/keycloak/user/UserUpdateControlBuilder.java
@@ -3,28 +3,28 @@ package de.ozgcloud.operator.keycloak.user;
 import java.time.Duration;
 import java.util.Optional;
 
-import de.ozgcloud.operator.keycloak.OzgCustomResourceStatus;
+import de.ozgcloud.operator.keycloak.OzgCloudCustomResourceStatus;
 import io.javaoperatorsdk.operator.api.reconciler.UpdateControl;
 
 class UserUpdateControlBuilder {
 
-	private OzgKeycloakUser resource;
+	private OzgCloudKeycloakUser resource;
 
-	private OzgCustomResourceStatus status;
+	private OzgCloudCustomResourceStatus status;
 	private Optional<String> message = Optional.empty();
 
 	private boolean reschedule = false;
 	private Duration scheduleDuration;
 
-	public UserUpdateControlBuilder(OzgKeycloakUser resource) {
+	public UserUpdateControlBuilder(OzgCloudKeycloakUser resource) {
 		this.resource = resource;
 	}
 
-	public static UserUpdateControlBuilder fromResource(OzgKeycloakUser resource) {
+	public static UserUpdateControlBuilder fromResource(OzgCloudKeycloakUser resource) {
 		return new UserUpdateControlBuilder(resource);
 	}
 
-	public UserUpdateControlBuilder withStatus(OzgCustomResourceStatus status) {
+	public UserUpdateControlBuilder withStatus(OzgCloudCustomResourceStatus status) {
 		this.status = status;
 		return this;
 	}
@@ -40,20 +40,20 @@ class UserUpdateControlBuilder {
 		return this;
 	}
 
-	public UpdateControl<OzgKeycloakUser> build() {
-		resource.setStatus(buildOzgKeycloakUserStatus());
+	public UpdateControl<OzgCloudKeycloakUser> build() {
+		resource.setStatus(buildOzgCloudKeycloakUserStatus());
 
 		return buildUpdateControl();
 	}
 
-	private OzgKeycloakUserStatus buildOzgKeycloakUserStatus() {
-		var userStatus = OzgKeycloakUserStatus.builder().status(status);
+	private OzgCloudKeycloakUserStatus buildOzgCloudKeycloakUserStatus() {
+		var userStatus = OzgCloudKeycloakUserStatus.builder().status(status);
 		message.ifPresent(userStatus::message);
 
 		return userStatus.build();
 	}
 
-	private UpdateControl<OzgKeycloakUser> buildUpdateControl() {
+	private UpdateControl<OzgCloudKeycloakUser> buildUpdateControl() {
 		if (reschedule) {
 			return UpdateControl.updateStatus(resource).rescheduleAfter(scheduleDuration);
 		}
diff --git a/src/test/helm/deployment_matchlabels_test.yaml b/src/test/helm/deployment_matchlabels_test.yaml
index feeaa0e271253271a7e31e0313ed4ba53b7c8715..2f8cde74b7f150ac26dd95e46a8d8a9aa064915e 100644
--- a/src/test/helm/deployment_matchlabels_test.yaml
+++ b/src/test/helm/deployment_matchlabels_test.yaml
@@ -24,7 +24,7 @@
 
 suite: deployment matchlabels
 release:
-  name: ozg-operator
+  name: ozgcloud-keycloak-operator
   namespace: sh-helm-test
 templates:
   - templates/deployment.yaml
@@ -37,14 +37,14 @@ tests:
     asserts:
       - equal:
           path: spec.selector.matchLabels.[app.kubernetes.io/name]
-          value: ozg-operator
+          value: ozgcloud-keycloak-operator
       - equal:
           path: spec.selector.matchLabels.[app.kubernetes.io/namespace]
           value: sh-helm-test
 
       - equal:
           path: spec.template.metadata.labels.[app.kubernetes.io/name]
-          value: ozg-operator
+          value: ozgcloud-keycloak-operator
       - equal:
           path: spec.template.metadata.labels.[app.kubernetes.io/namespace]
           value: sh-helm-test
\ No newline at end of file
diff --git a/src/test/helm/deployment_metadata_labels_test.yaml b/src/test/helm/deployment_metadata_labels_test.yaml
index 20ab66a4aca6efc734db249c2cc64f13319813de..1cbd552473f472618b142f2f2e244ef0937ed3a5 100644
--- a/src/test/helm/deployment_metadata_labels_test.yaml
+++ b/src/test/helm/deployment_metadata_labels_test.yaml
@@ -24,7 +24,7 @@
 
 suite: deployment test metadata labels
 release:
-  name: ozg-operator
+  name: ozgcloud-keycloak-operator
   namespace: sh-helm-test
 templates:
   - templates/deployment.yaml
@@ -37,10 +37,10 @@ tests:
     asserts:
       - equal:
           path: metadata.labels.[app.kubernetes.io/instance]
-          value: ozg-operator
+          value: ozgcloud-keycloak-operator
       - equal:
           path: metadata.labels.[app.kubernetes.io/name]
-          value: ozg-operator
+          value: ozgcloud-keycloak-operator
       - equal:
           path: metadata.labels.[app.kubernetes.io/part-of]
           value: ozg
diff --git a/src/test/helm/deployment_pull_secret_test.yaml b/src/test/helm/deployment_pull_secret_test.yaml
index 1bd9be1215c704463654dead4e9794ff16be5502..659b348d8afbbd1a9bb4dca4ea65e85cf8e3f69b 100644
--- a/src/test/helm/deployment_pull_secret_test.yaml
+++ b/src/test/helm/deployment_pull_secret_test.yaml
@@ -24,7 +24,7 @@
 
 suite: deployment pull secret
 release:
-  name: ozg-operator
+  name: ozgcloud-keycloak-operator
   namespace: sh-helm-test
 templates:
   - deployment.yaml
@@ -37,4 +37,4 @@ tests:
     asserts:
       - equal:
           path: spec.template.spec.imagePullSecrets[0].name
-          value: ozg-operator-image-pull-secret
+          value: ozgcloud-keycloak-operator-image-pull-secret
diff --git a/src/test/helm/rbacs/keycloak_admin_secret_read.yaml b/src/test/helm/rbacs/keycloak_admin_secret_read.yaml
index 214392dc7e8e146750874e6c06aa2ec67305175a..f8110ec01bf2299ea649c18728675592e7a7f1b8 100644
--- a/src/test/helm/rbacs/keycloak_admin_secret_read.yaml
+++ b/src/test/helm/rbacs/keycloak_admin_secret_read.yaml
@@ -24,7 +24,7 @@
 
 suite: Keycloak admin secret rbac test
 release:
-  name: ozg-operator
+  name: ozgcloud-keycloak-operator
   namespace: test-namespace
 templates:
   - templates/rbacs/keycloak_admin_secret_read.yaml
@@ -36,7 +36,7 @@ tests:
         documentIndex: 0
       - equal:
           path: metadata.name
-          value: ozg-operator-keycloak-admin-secret-viewer-role-binding
+          value: ozgcloud-keycloak-operator-admin-secret-viewer-role-binding
         documentIndex: 0
       - equal:
           path: metadata.namespace
@@ -48,7 +48,7 @@ tests:
           path: subjects
           content:
             kind: ServiceAccount
-            name: ozg-operator-serviceaccount
+            name: ozgcloud-keycloak-operator-serviceaccount
             namespace: test-namespace
         documentIndex: 0
   - it: test RoleBinding roleRef
@@ -57,7 +57,7 @@ tests:
           path: roleRef
           value:
             kind: Role
-            name: ozg-operator-keycloak-admin-secret-viewer-role
+            name: ozgcloud-keycloak-operator-admin-secret-viewer-role
             apiGroup: rbac.authorization.k8s.io
         documentIndex: 0
 
@@ -68,7 +68,7 @@ tests:
         documentIndex: 1
       - equal:
           path: metadata.name
-          value: ozg-operator-keycloak-admin-secret-viewer-role
+          value: ozgcloud-keycloak-operator-admin-secret-viewer-role
         documentIndex: 1
       - equal:
           path: metadata.namespace
diff --git a/src/test/helm/rbacs/keycloak_read_test.yaml b/src/test/helm/rbacs/keycloak_read_test.yaml
index 840ac9bda92453fa466217fb726932599a7dab3a..2a52cf0982d275a62256ead45acc6475bfd94630 100644
--- a/src/test/helm/rbacs/keycloak_read_test.yaml
+++ b/src/test/helm/rbacs/keycloak_read_test.yaml
@@ -24,7 +24,7 @@
 
 suite: Keycloak read rbac test
 release:
-  name: ozg-operator
+  name: ozgcloud-keycloak-operator
   namespace: test-namespace
 templates:
   - templates/rbacs/keycloak_read.yaml
@@ -36,7 +36,7 @@ tests:
         documentIndex: 0
       - equal:
           path: metadata.name
-          value: ozg-operator-keycloak-viewer-role-binding
+          value: ozgcloud-keycloak-operator-viewer-role-binding
         documentIndex: 0
   - it: test ClusterRoleBinding subject
     asserts:
@@ -44,7 +44,7 @@ tests:
           path: subjects
           content:
             kind: ServiceAccount
-            name: ozg-operator-serviceaccount
+            name: ozgcloud-keycloak-operator-serviceaccount
             namespace: test-namespace
         documentIndex: 0
   - it: test ClusterRoleBinding roleRef
@@ -53,7 +53,7 @@ tests:
           path: roleRef
           value:
             kind: ClusterRole
-            name: ozg-operator-keycloak-viewer-role
+            name: ozgcloud-keycloak-operator-viewer-role
             apiGroup: rbac.authorization.k8s.io
         documentIndex: 0
 
@@ -64,7 +64,7 @@ tests:
         documentIndex: 1
       - equal:
           path: metadata.name
-          value: ozg-operator-keycloak-viewer-role
+          value: ozgcloud-keycloak-operator-viewer-role
         documentIndex: 1
   - it: test ClusterRoleBinding rules
     asserts:
@@ -74,18 +74,18 @@ tests:
               apiGroups:
                 - operator.ozgcloud.de
               resources:
-                - ozgkeycloakusers
-                - ozgkeycloakusers/status
-                - ozgkeycloakusers/finalizers
-                - ozgkeycloakgroups
-                - ozgkeycloakgroups/status
-                - ozgkeycloakgroups/finalizers
-                - ozgkeycloakrealms
-                - ozgkeycloakrealms/status
-                - ozgkeycloakrealms/finalizers
-                - ozgkeycloakclients
-                - ozgkeycloakclients/status
-                - ozgkeycloakclients/finalizers
+                - ozgcloudkeycloakusers
+                - ozgcloudkeycloakusers/status
+                - ozgcloudkeycloakusers/finalizers
+                - ozgcloudkeycloakgroups
+                - ozgcloudkeycloakgroups/status
+                - ozgcloudkeycloakgroups/finalizers
+                - ozgcloudkeycloakrealms
+                - ozgcloudkeycloakrealms/status
+                - ozgcloudkeycloakrealms/finalizers
+                - ozgcloudkeycloakclients
+                - ozgcloudkeycloakclients/status
+                - ozgcloudkeycloakclients/finalizers
               verbs:
                 - get
                 - list
diff --git a/src/test/helm/rbacs/keycloak_write_test.yaml b/src/test/helm/rbacs/keycloak_write_test.yaml
index 6aa6630738727ae77a84194ea3a769b89ceffa95..98fe2eb9243a9126110b42fc7b6e36a3881aa5f3 100644
--- a/src/test/helm/rbacs/keycloak_write_test.yaml
+++ b/src/test/helm/rbacs/keycloak_write_test.yaml
@@ -24,7 +24,7 @@
 
 suite: Keycloak write rbac test
 release:
-  name: ozg-operator
+  name: ozgcloud-keycloak-operator
   namespace: test-namespace
 templates:
   - templates/rbacs/keycloak_write.yaml
@@ -36,7 +36,7 @@ tests:
         documentIndex: 0
       - equal:
           path: metadata.name
-          value: ozg-operator-keycloak-write-role-binding
+          value: ozgcloud-keycloak-operator-write-role-binding
         documentIndex: 0
   - it: test ClusterRoleBinding subject
     asserts:
@@ -44,7 +44,7 @@ tests:
           path: subjects
           content:
             kind: ServiceAccount
-            name: ozg-operator-serviceaccount
+            name: ozgcloud-keycloak-operator-serviceaccount
             namespace: test-namespace
         documentIndex: 0
   - it: test ClusterRoleBinding roleRef
@@ -53,7 +53,7 @@ tests:
           path: roleRef
           value:
             kind: ClusterRole
-            name: ozg-operator-keycloak-write-role
+            name: ozgcloud-keycloak-operator-write-role
             apiGroup: rbac.authorization.k8s.io
         documentIndex: 0
 
@@ -64,7 +64,7 @@ tests:
         documentIndex: 1
       - equal:
           path: metadata.name
-          value: ozg-operator-keycloak-write-role
+          value: ozgcloud-keycloak-operator-write-role
         documentIndex: 1
   - it: test ClusterRoleBinding rules
     asserts:
@@ -74,18 +74,18 @@ tests:
               apiGroups:
                 - operator.ozgcloud.de
               resources:
-                - ozgkeycloakusers
-                - ozgkeycloakusers/status
-                - ozgkeycloakusers/finalizers
-                - ozgkeycloakgroups
-                - ozgkeycloakgroups/status
-                - ozgkeycloakgroups/finalizers
-                - ozgkeycloakrealms
-                - ozgkeycloakrealms/status
-                - ozgkeycloakrealms/finalizers
-                - ozgkeycloakclients
-                - ozgkeycloakclients/status
-                - ozgkeycloakclients/finalizers
+                - ozgcloudkeycloakusers
+                - ozgcloudkeycloakusers/status
+                - ozgcloudkeycloakusers/finalizers
+                - ozgcloudkeycloakgroups
+                - ozgcloudkeycloakgroups/status
+                - ozgcloudkeycloakgroups/finalizers
+                - ozgcloudkeycloakrealms
+                - ozgcloudkeycloakrealms/status
+                - ozgcloudkeycloakrealms/finalizers
+                - ozgcloudkeycloakclients
+                - ozgcloudkeycloakclients/status
+                - ozgcloudkeycloakclients/finalizers
               verbs:
                 - patch
                 - update
diff --git a/src/test/helm/rbacs/serviceaccount_test.yaml b/src/test/helm/rbacs/serviceaccount_test.yaml
index 5f79cd62174d48bac5b5fc5fbd6964213840e51b..e4544eed75e979f1b5b09802fcf9ddff34f6f4fc 100644
--- a/src/test/helm/rbacs/serviceaccount_test.yaml
+++ b/src/test/helm/rbacs/serviceaccount_test.yaml
@@ -24,7 +24,7 @@
 
 suite: ServiceAccount test
 release:
-  name: ozg-operator
+  name: ozgcloud-keycloak-operator
   namespace: test-namespace
 templates:
   - templates/rbacs/serviceaccount.yaml
@@ -35,7 +35,7 @@ tests:
           of: ServiceAccount
       - equal:
           path: metadata.name
-          value: ozg-operator-serviceaccount
+          value: ozgcloud-keycloak-operator-serviceaccount
       - equal:
           path: metadata.namespace
           value: test-namespace
\ No newline at end of file
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/KeycloakLivelTest.java b/src/test/java/de/ozgcloud/operator/keycloak/KeycloakLivelTest.java
index 35230aed141e971c3e35c8c5a55c875d2cde5233..364285dc4e36ea3d1932e45a415211eb6b4cf955 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/KeycloakLivelTest.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/KeycloakLivelTest.java
@@ -55,7 +55,7 @@ class KeycloakLivelTest {
 
 		FieldUtils.writeField(service, "keycloak", kc, true);
 
-		Optional<RoleRepresentation> rsp = service.getClientRole("VERWALTUNG_LOESCHEN", "alfa", "by-torsten-ozg-operator-dev");
+		Optional<RoleRepresentation> rsp = service.getClientRole("VERWALTUNG_LOESCHEN", "alfa", "by-torsten-ozgcloud-keycloak-operator-dev");
 		assertThat(rsp).isPresent();
 	}
 }
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/client/KeycloakClientMapperTest.java b/src/test/java/de/ozgcloud/operator/keycloak/client/KeycloakClientMapperTest.java
index e368d9840e7b9f8056ca12893d138b21af54f86f..9ddecb70c5ee4b8cda415504ba74351519e261c9 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/client/KeycloakClientMapperTest.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/client/KeycloakClientMapperTest.java
@@ -41,77 +41,77 @@ class KeycloakClientMapperTest {
 
 		@Test
 		void shouldMapClientId() {
-			var client = mapper.map(OzgKeycloakClientSpecTestFactory.create());
+			var client = mapper.map(OzgCloudKeycloakClientSpecTestFactory.create());
 
-			assertThat(client.getClientId()).isEqualTo(OzgKeycloakClientSpecTestFactory.CLIENT_ID);
+			assertThat(client.getClientId()).isEqualTo(OzgCloudKeycloakClientSpecTestFactory.CLIENT_ID);
 		}
 
 		@Test
 		void shouldMapBaseUrl() {
-			var client = mapper.map(OzgKeycloakClientSpecTestFactory.create());
+			var client = mapper.map(OzgCloudKeycloakClientSpecTestFactory.create());
 
-			assertThat(client.getBaseUrl()).isEqualTo(OzgKeycloakClientSpecTestFactory.BASE_URL);
+			assertThat(client.getBaseUrl()).isEqualTo(OzgCloudKeycloakClientSpecTestFactory.BASE_URL);
 		}
 
 		@Test
 		void shouldMapRedirectUris() {
-			var client = mapper.map(OzgKeycloakClientSpecTestFactory.create());
+			var client = mapper.map(OzgCloudKeycloakClientSpecTestFactory.create());
 
-			assertThat(client.getRedirectUris()).isEqualTo(OzgKeycloakClientSpecTestFactory.REDIRECT_URLS);
+			assertThat(client.getRedirectUris()).isEqualTo(OzgCloudKeycloakClientSpecTestFactory.REDIRECT_URLS);
 		}
 
 		@Test
 		void shouldMapWebOrigins() {
-			var client = mapper.map(OzgKeycloakClientSpecTestFactory.create());
+			var client = mapper.map(OzgCloudKeycloakClientSpecTestFactory.create());
 
-			assertThat(client.getWebOrigins()).isEqualTo(OzgKeycloakClientSpecTestFactory.WEB_ORIGINS);
+			assertThat(client.getWebOrigins()).isEqualTo(OzgCloudKeycloakClientSpecTestFactory.WEB_ORIGINS);
 		}
 
 		@Test
 		void testProtocol() {
-			var client = mapper.map(OzgKeycloakClientSpecTestFactory.create());
+			var client = mapper.map(OzgCloudKeycloakClientSpecTestFactory.create());
 
 			assertThat(client.getProtocol()).isEqualTo(KeycloakClientMapper.PROTOCOL);
 		}
 
 		@Test
 		void testImplicitFlowEnabled() {
-			var client = mapper.map(OzgKeycloakClientSpecTestFactory.create());
+			var client = mapper.map(OzgCloudKeycloakClientSpecTestFactory.create());
 
 			assertThat(client.isImplicitFlowEnabled()).isTrue();
 		}
 
 		@Test
 		void testDirectAccessGrantsEnabled() {
-			var client = mapper.map(OzgKeycloakClientSpecTestFactory.create());
+			var client = mapper.map(OzgCloudKeycloakClientSpecTestFactory.create());
 
 			assertThat(client.isDirectAccessGrantsEnabled()).isTrue();
 		}
 
 		@Test
 		void testStandardFlowEnabled() {
-			var client = mapper.map(OzgKeycloakClientSpecTestFactory.create());
+			var client = mapper.map(OzgCloudKeycloakClientSpecTestFactory.create());
 
 			assertThat(client.isStandardFlowEnabled()).isTrue();
 		}
 
 		@Test
 		void testPublicClientEnabled() {
-			var client = mapper.map(OzgKeycloakClientSpecTestFactory.create());
+			var client = mapper.map(OzgCloudKeycloakClientSpecTestFactory.create());
 
 			assertThat(client.isPublicClient()).isTrue();
 		}
 
 		@Test
 		void testBearerOnlyEnabled() {
-			var client = mapper.map(OzgKeycloakClientSpecTestFactory.create());
+			var client = mapper.map(OzgCloudKeycloakClientSpecTestFactory.create());
 
 			assertThat(client.isBearerOnly()).isFalse();
 		}
 
 		@Test
 		void testPostLogoutRedirectUri() {
-			var client = mapper.map(OzgKeycloakClientSpecTestFactory.create());
+			var client = mapper.map(OzgCloudKeycloakClientSpecTestFactory.create());
 
 			assertThat(client.getAttributes())
 					.containsEntry(KeycloakClientMapper.ATTRIBUTE_NAME_POST_LOGOUT_REDIRECT_URIS,
@@ -124,77 +124,77 @@ class KeycloakClientMapperTest {
 
 		@Test
 		void shouldMapClientId() {
-			var client = mapper.update(new ClientRepresentation(), OzgKeycloakClientSpecTestFactory.create());
+			var client = mapper.update(new ClientRepresentation(), OzgCloudKeycloakClientSpecTestFactory.create());
 
-			assertThat(client.getClientId()).isEqualTo(OzgKeycloakClientSpecTestFactory.CLIENT_ID);
+			assertThat(client.getClientId()).isEqualTo(OzgCloudKeycloakClientSpecTestFactory.CLIENT_ID);
 		}
 
 		@Test
 		void shouldMapBaseUrl() {
-			var client = mapper.update(new ClientRepresentation(), OzgKeycloakClientSpecTestFactory.create());
+			var client = mapper.update(new ClientRepresentation(), OzgCloudKeycloakClientSpecTestFactory.create());
 
-			assertThat(client.getBaseUrl()).isEqualTo(OzgKeycloakClientSpecTestFactory.BASE_URL);
+			assertThat(client.getBaseUrl()).isEqualTo(OzgCloudKeycloakClientSpecTestFactory.BASE_URL);
 		}
 
 		@Test
 		void shouldMapRedirectUris() {
-			var client = mapper.update(new ClientRepresentation(), OzgKeycloakClientSpecTestFactory.create());
+			var client = mapper.update(new ClientRepresentation(), OzgCloudKeycloakClientSpecTestFactory.create());
 
-			assertThat(client.getRedirectUris()).isEqualTo(OzgKeycloakClientSpecTestFactory.REDIRECT_URLS);
+			assertThat(client.getRedirectUris()).isEqualTo(OzgCloudKeycloakClientSpecTestFactory.REDIRECT_URLS);
 		}
 
 		@Test
 		void shouldMapWebOrigins() {
-			var client = mapper.update(new ClientRepresentation(), OzgKeycloakClientSpecTestFactory.create());
+			var client = mapper.update(new ClientRepresentation(), OzgCloudKeycloakClientSpecTestFactory.create());
 
-			assertThat(client.getWebOrigins()).isEqualTo(OzgKeycloakClientSpecTestFactory.WEB_ORIGINS);
+			assertThat(client.getWebOrigins()).isEqualTo(OzgCloudKeycloakClientSpecTestFactory.WEB_ORIGINS);
 		}
 
 		@Test
 		void testProtocol() {
-			var client = mapper.update(new ClientRepresentation(), OzgKeycloakClientSpecTestFactory.create());
+			var client = mapper.update(new ClientRepresentation(), OzgCloudKeycloakClientSpecTestFactory.create());
 
 			assertThat(client.getProtocol()).isEqualTo(KeycloakClientMapper.PROTOCOL);
 		}
 
 		@Test
 		void testImplicitFlowEnabled() {
-			var client = mapper.update(new ClientRepresentation(), OzgKeycloakClientSpecTestFactory.create());
+			var client = mapper.update(new ClientRepresentation(), OzgCloudKeycloakClientSpecTestFactory.create());
 
 			assertThat(client.isImplicitFlowEnabled()).isTrue();
 		}
 
 		@Test
 		void testDirectAccessGrantsEnabled() {
-			var client = mapper.update(new ClientRepresentation(), OzgKeycloakClientSpecTestFactory.create());
+			var client = mapper.update(new ClientRepresentation(), OzgCloudKeycloakClientSpecTestFactory.create());
 
 			assertThat(client.isDirectAccessGrantsEnabled()).isTrue();
 		}
 
 		@Test
 		void testStandardFlowEnabled() {
-			var client = mapper.update(new ClientRepresentation(), OzgKeycloakClientSpecTestFactory.create());
+			var client = mapper.update(new ClientRepresentation(), OzgCloudKeycloakClientSpecTestFactory.create());
 
 			assertThat(client.isStandardFlowEnabled()).isTrue();
 		}
 
 		@Test
 		void testPublicClientEnabled() {
-			var client = mapper.update(new ClientRepresentation(), OzgKeycloakClientSpecTestFactory.create());
+			var client = mapper.update(new ClientRepresentation(), OzgCloudKeycloakClientSpecTestFactory.create());
 
 			assertThat(client.isPublicClient()).isTrue();
 		}
 
 		@Test
 		void testBearerOnlyEnabled() {
-			var client = mapper.update(new ClientRepresentation(), OzgKeycloakClientSpecTestFactory.create());
+			var client = mapper.update(new ClientRepresentation(), OzgCloudKeycloakClientSpecTestFactory.create());
 
 			assertThat(client.isBearerOnly()).isFalse();
 		}
 
 		@Test
 		void testPostLogoutRedirectUri() {
-			var client = mapper.update(new ClientRepresentation(), OzgKeycloakClientSpecTestFactory.create());
+			var client = mapper.update(new ClientRepresentation(), OzgCloudKeycloakClientSpecTestFactory.create());
 
 			assertThat(client.getAttributes())
 					.containsEntry(KeycloakClientMapper.ATTRIBUTE_NAME_POST_LOGOUT_REDIRECT_URIS,
@@ -207,9 +207,9 @@ class KeycloakClientMapperTest {
 
 		@Test
 		void shouldMapClientName() {
-			var role = mapper.mapRole(OzgKeycloakClientSpecTestFactory.ROLE1);
+			var role = mapper.mapRole(OzgCloudKeycloakClientSpecTestFactory.ROLE1);
 
-			assertThat(role.getName()).isEqualTo(OzgKeycloakClientSpecTestFactory.ROLE_NAME_1);
+			assertThat(role.getName()).isEqualTo(OzgCloudKeycloakClientSpecTestFactory.ROLE_NAME_1);
 		}
 	}
 
@@ -218,9 +218,9 @@ class KeycloakClientMapperTest {
 
 		@Test
 		void shouldUpdateClientName() {
-			var role = mapper.updateRole(RoleRepresentationTestFactory.create(), OzgKeycloakClientSpecTestFactory.ROLE2);
+			var role = mapper.updateRole(RoleRepresentationTestFactory.create(), OzgCloudKeycloakClientSpecTestFactory.ROLE2);
 
-			assertThat(role.getName()).isEqualTo(OzgKeycloakClientSpecTestFactory.ROLE_NAME_2);
+			assertThat(role.getName()).isEqualTo(OzgCloudKeycloakClientSpecTestFactory.ROLE_NAME_2);
 		}
 	}
 
@@ -232,46 +232,46 @@ class KeycloakClientMapperTest {
 
 			@Test
 			void shouldMapProtocolMapper() {
-				var client = mapper.map(OzgKeycloakClientSpecTestFactory.create());
+				var client = mapper.map(OzgCloudKeycloakClientSpecTestFactory.create());
 
 				assertThat(client.getProtocolMappers()).isNotEmpty();
 			}
 
 			@Test
 			void shouldMapName() {
-				var clientSpec = OzgKeycloakClientSpecTestFactory.create();
+				var clientSpec = OzgCloudKeycloakClientSpecTestFactory.create();
 
 				var protocolMapper = mapper.map(clientSpec).getProtocolMappers().get(0);
 
-				assertThat(protocolMapper.getName()).isEqualTo(OzgKeycloakClientSpecProtocolMapperTestFactory.NAME);
+				assertThat(protocolMapper.getName()).isEqualTo(OzgCloudKeycloakClientSpecProtocolMapperTestFactory.NAME);
 			}
 
 			@Test
 			void shouldMapProtocol() {
-				var clientSpec = OzgKeycloakClientSpecTestFactory.create();
+				var clientSpec = OzgCloudKeycloakClientSpecTestFactory.create();
 
 				var protocolMapper = mapper.map(clientSpec).getProtocolMappers().get(0);
 
-				assertThat(protocolMapper.getProtocol()).isEqualTo(OzgKeycloakClientSpecProtocolMapperTestFactory.PROTOCOL);
+				assertThat(protocolMapper.getProtocol()).isEqualTo(OzgCloudKeycloakClientSpecProtocolMapperTestFactory.PROTOCOL);
 			}
 
 			@Test
 			void shouldMapType() {
-				var clientSpec = OzgKeycloakClientSpecTestFactory.create();
+				var clientSpec = OzgCloudKeycloakClientSpecTestFactory.create();
 
 				var protocolMapper = mapper.map(clientSpec).getProtocolMappers().get(0);
 
-				assertThat(protocolMapper.getProtocolMapper()).isEqualTo(OzgKeycloakClientSpecProtocolMapperTestFactory.TYPE);
+				assertThat(protocolMapper.getProtocolMapper()).isEqualTo(OzgCloudKeycloakClientSpecProtocolMapperTestFactory.TYPE);
 			}
 
 			@Test
 			void shouldMapConfig() {
-				var clientSpec = OzgKeycloakClientSpecTestFactory.create();
+				var clientSpec = OzgCloudKeycloakClientSpecTestFactory.create();
 
 				var protocolMapper = mapper.map(clientSpec).getProtocolMappers().get(0);
 
-				assertThat(protocolMapper.getConfig()).containsEntry(OzgKeycloakClientSpecProtocolMapperTestFactory.CONFIG_KEY_1,
-						OzgKeycloakClientSpecProtocolMapperTestFactory.CONFIG_VALUE_1);
+				assertThat(protocolMapper.getConfig()).containsEntry(OzgCloudKeycloakClientSpecProtocolMapperTestFactory.CONFIG_KEY_1,
+						OzgCloudKeycloakClientSpecProtocolMapperTestFactory.CONFIG_VALUE_1);
 			}
 		}
 	}
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/client/KeycloakClientPreconditionServiceTest.java b/src/test/java/de/ozgcloud/operator/keycloak/client/KeycloakClientPreconditionServiceTest.java
index 2571c2f7397b893d03f473ee02e10d0ed83dfd68..72ecf4b25b6665fd2751f20a83a1f45a8604160b 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/client/KeycloakClientPreconditionServiceTest.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/client/KeycloakClientPreconditionServiceTest.java
@@ -51,16 +51,16 @@ class KeycloakClientPreconditionServiceTest {
 		void shouldCallRealmExists() {
 			when(genericRemoteService.realmExists(any())).thenReturn(false);
 
-			service.getReconcilePreconditionErrors(OzgKeycloakClientTestFactory.create());
+			service.getReconcilePreconditionErrors(OzgCloudKeycloakClientTestFactory.create());
 
-			verify(genericRemoteService).realmExists(OzgKeycloakClientTestFactory.METADATA_NAMESPACE);
+			verify(genericRemoteService).realmExists(OzgCloudKeycloakClientTestFactory.METADATA_NAMESPACE);
 		}
 
 		@Test
 		void shouldReturnErrorIfRealmNotExists() {
 			doReturn(false).when(genericRemoteService).realmExists(anyString());
 
-			var response = service.getReconcilePreconditionErrors(OzgKeycloakClientTestFactory.create());
+			var response = service.getReconcilePreconditionErrors(OzgCloudKeycloakClientTestFactory.create());
 
 			assertThat(response).isPresent();
 		}
@@ -69,7 +69,7 @@ class KeycloakClientPreconditionServiceTest {
 		void shouldReturnEmptyIfRealmExists() {
 			doReturn(true).when(genericRemoteService).realmExists(anyString());
 
-			var response = service.getReconcilePreconditionErrors(OzgKeycloakClientTestFactory.create());
+			var response = service.getReconcilePreconditionErrors(OzgCloudKeycloakClientTestFactory.create());
 
 			assertThat(response).isEmpty();
 		}
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/client/KeycloakClientReconcilerTest.java b/src/test/java/de/ozgcloud/operator/keycloak/client/KeycloakClientReconcilerTest.java
index 3a4bd2c7a4dad46eb3136a157ff6fd2179dd5541..c8f41130a340729d0bc529d78fed419219798e88 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/client/KeycloakClientReconcilerTest.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/client/KeycloakClientReconcilerTest.java
@@ -35,7 +35,7 @@ import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.Spy;
 
-import de.ozgcloud.operator.keycloak.OzgCustomResourceStatus;
+import de.ozgcloud.operator.keycloak.OzgCloudCustomResourceStatus;
 
 class KeycloakClientReconcilerTest {
 
@@ -56,54 +56,34 @@ class KeycloakClientReconcilerTest {
 
 		@Test
 		void shouldCallServiceAddClient() {
-			OzgKeycloakClient client = OzgKeycloakClientTestFactory.create();
+			OzgCloudKeycloakClient client = OzgCloudKeycloakClientTestFactory.create();
 
 			reconciler.reconcile(client, null);
 
-			verify(service).createOrUpdateClient(client.getSpec(), OzgKeycloakClientTestFactory.METADATA_NAMESPACE);
+			verify(service).createOrUpdateClient(client.getSpec(), OzgCloudKeycloakClientTestFactory.METADATA_NAMESPACE);
 		}
 
 		@Test
 		void shouldReturnUpdateStatus() {
-			var response = reconciler.reconcile(OzgKeycloakClientTestFactory.create(), null);
+			var response = reconciler.reconcile(OzgCloudKeycloakClientTestFactory.create(), null);
 
 			assertThat(response.getResource()).isNotNull();
 		}
 
 		@Test
 		void shouldSetStatusOk() {
-			var response = reconciler.reconcile(OzgKeycloakClientTestFactory.create(), null);
+			var response = reconciler.reconcile(OzgCloudKeycloakClientTestFactory.create(), null);
 
-			assertThat(response.getResource().getStatus().getStatus()).isEqualTo(OzgCustomResourceStatus.OK);
+			assertThat(response.getResource().getStatus().getStatus()).isEqualTo(OzgCloudCustomResourceStatus.OK);
 		}
 
 		@Test
 		void shouldReturnInProgressStatusIfPreconditionsNotMet() {
 			when(preconditionService.getReconcilePreconditionErrors(any())).thenReturn(Optional.of(ERROR_MESSAGE));
 
-			var response = reconciler.reconcile(OzgKeycloakClientTestFactory.create(), null);
+			var response = reconciler.reconcile(OzgCloudKeycloakClientTestFactory.create(), null);
 
-			assertThat(response.getResource().getStatus().getStatus()).isEqualTo(OzgCustomResourceStatus.IN_PROGRESS);
+			assertThat(response.getResource().getStatus().getStatus()).isEqualTo(OzgCloudCustomResourceStatus.IN_PROGRESS);
 		}
 	}
-//
-//	@Nested
-//	class TestUpdateErrorStatus {
-//
-//		@Test
-//		void shouldSetErrorStatus() {
-//			var response = reconciler.updateErrorStatus(OzgKeycloakClientTestFactory.create(), null, new RuntimeException(ERROR_MESSAGE));
-//
-//			assertThat(response.getResource()).isPresent().map(OzgKeycloakClient::getStatus).map(OzgKeycloakClientStatus::getStatus)
-//					.contains(OzgCustomResourceStatus.ERROR);
-//		}
-//
-//		@Test
-//		void shouldSetMessage() {
-//			var response = reconciler.updateErrorStatus(OzgKeycloakClientTestFactory.create(), null, new RuntimeException(ERROR_MESSAGE));
-//
-//			assertThat(response.getResource()).isPresent().map(OzgKeycloakClient::getStatus).map(OzgKeycloakClientStatus::getMessage)
-//					.contains(ERROR_MESSAGE);
-//		}
-//	}
 }
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/client/KeycloakClientServiceTest.java b/src/test/java/de/ozgcloud/operator/keycloak/client/KeycloakClientServiceTest.java
index bdbacdeae89ee5305f6db60cc909d37cc1afec0f..e1e399d977185f1f3f9a2b877c83066ad8bf6a0c 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/client/KeycloakClientServiceTest.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/client/KeycloakClientServiceTest.java
@@ -23,7 +23,7 @@
  */
 package de.ozgcloud.operator.keycloak.client;
 
-import static de.ozgcloud.operator.keycloak.client.OzgKeycloakClientSpecTestFactory.*;
+import static de.ozgcloud.operator.keycloak.client.OzgCloudKeycloakClientSpecTestFactory.*;
 import static org.assertj.core.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
@@ -67,7 +67,7 @@ class KeycloakClientServiceTest {
 
 		@Test
 		void shouldCallCreateClientMethod() {
-			var clientSpec = OzgKeycloakClientSpecTestFactory.create();
+			var clientSpec = OzgCloudKeycloakClientSpecTestFactory.create();
 			doNothing().when(service).createClient(clientSpec, TEST_NAMESPACE);
 
 			service.createOrUpdateClient(clientSpec, TEST_NAMESPACE);
@@ -77,10 +77,10 @@ class KeycloakClientServiceTest {
 
 		@Test
 		void shouldCallUpdateClientMethod() {
-			var clientSpec = OzgKeycloakClientSpecTestFactory.create();
+			var clientSpec = OzgCloudKeycloakClientSpecTestFactory.create();
 			var clientRepresentation = ClientRepresentationTestFactory.create();
 			doNothing().when(service).updateClient(clientRepresentation, clientSpec, TEST_NAMESPACE);
-			when(keycloakGenericRemoteService.getByClientId(OzgKeycloakClientSpecTestFactory.CLIENT_ID, TEST_NAMESPACE))
+			when(keycloakGenericRemoteService.getByClientId(OzgCloudKeycloakClientSpecTestFactory.CLIENT_ID, TEST_NAMESPACE))
 					.thenReturn(Optional.of(clientRepresentation));
 
 			service.createOrUpdateClient(clientSpec, TEST_NAMESPACE);
@@ -93,7 +93,7 @@ class KeycloakClientServiceTest {
 	@Nested
 	class TestCreateClient {
 
-		private final OzgKeycloakClientSpec client = OzgKeycloakClientSpecTestFactory.create();
+		private final OzgCloudKeycloakClientSpec client = OzgCloudKeycloakClientSpecTestFactory.create();
 		private final ClientRepresentation clientRepresentation = ClientRepresentationTestFactory.create();
 
 		@BeforeEach
@@ -233,7 +233,7 @@ class KeycloakClientServiceTest {
 	class TestUpdateClient {
 
 		private final ClientRepresentation clientRepresentation = ClientRepresentationTestFactory.create();
-		private final OzgKeycloakClientSpec client = OzgKeycloakClientSpecTestFactory.create();
+		private final OzgCloudKeycloakClientSpec client = OzgCloudKeycloakClientSpecTestFactory.create();
 
 		@BeforeEach
 		void init() {
@@ -276,7 +276,7 @@ class KeycloakClientServiceTest {
 
 		@Test
 		void shouldCallRemoteServiceGetRole() {
-			service.addOrUpdateClientRoles(OzgKeycloakClientSpecTestFactory.create(), TEST_NAMESPACE, REAL_CLIENT_ID);
+			service.addOrUpdateClientRoles(OzgCloudKeycloakClientSpecTestFactory.create(), TEST_NAMESPACE, REAL_CLIENT_ID);
 
 			verify(keycloakGenericRemoteService).getClientRole(ROLE_NAME_1, REAL_CLIENT_ID,
 					TEST_NAMESPACE);
@@ -289,7 +289,7 @@ class KeycloakClientServiceTest {
 			var roleRepresentation = RoleRepresentationTestFactory.create();
 			when(mapper.mapRole(any())).thenReturn(roleRepresentation);
 
-			service.addOrUpdateClientRoles(OzgKeycloakClientSpecTestFactory.create(), TEST_NAMESPACE, REAL_CLIENT_ID);
+			service.addOrUpdateClientRoles(OzgCloudKeycloakClientSpecTestFactory.create(), TEST_NAMESPACE, REAL_CLIENT_ID);
 
 			verify(remoteService).addClientRole(roleRepresentation, REAL_CLIENT_ID, TEST_NAMESPACE);
 		}
@@ -301,7 +301,7 @@ class KeycloakClientServiceTest {
 					TEST_NAMESPACE)).thenReturn(Optional.of(roleRepresentation));
 			when(mapper.updateRole(any(), any())).thenReturn(roleRepresentation);
 
-			service.addOrUpdateClientRoles(OzgKeycloakClientSpecTestFactory.create(), TEST_NAMESPACE, REAL_CLIENT_ID);
+			service.addOrUpdateClientRoles(OzgCloudKeycloakClientSpecTestFactory.create(), TEST_NAMESPACE, REAL_CLIENT_ID);
 
 			verify(remoteService).updateClientRole(roleRepresentation, REAL_CLIENT_ID, TEST_NAMESPACE);
 		}
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/client/KeycloakLivelTest.java b/src/test/java/de/ozgcloud/operator/keycloak/client/KeycloakLivelTest.java
index a1e2e9c67a3955d13776abd021f8f1783f727228..8329dcbd85ed1937b7389c1563c00f3b65d11366 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/client/KeycloakLivelTest.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/client/KeycloakLivelTest.java
@@ -56,24 +56,18 @@ class KeycloakLivelTest {
 
 		FieldUtils.writeField(remoteService, "keycloak", kc, true);
 
-		String realm = "by-torsten-ozg-operator-dev";
+		String realm = "by-torsten-ozgcloud-keycloak-operator-dev";
 
 		remoteService.createClient(createClient(), realm);
-//		remoteService.updateClient(createClient(), realm);
-
-//		remoteService.addClientRole(createRoles(), createClient().getClientId(), realm);
-//		Optional<RoleRepresentation> remoteRole = remoteService.getClientRole(OzgKeycloakClientSpecTestFactory.ROLE1.getName(),
-//				createClient().getClientId(), realm);
-//		remoteService.updateClientRole(remoteRole.get(), createClient().getClientId(), realm);
 	}
 
 	@SuppressWarnings("unused")
 	private RoleRepresentation createRoles() {
-		return mapper.mapRole(OzgKeycloakClientSpecTestFactory.ROLE1);
+		return mapper.mapRole(OzgCloudKeycloakClientSpecTestFactory.ROLE1);
 	}
 
 	private ClientRepresentation createClient() {
-		OzgKeycloakClientSpec client = OzgKeycloakClientSpecTestFactory.createBuilder()
+		OzgCloudKeycloakClientSpec client = OzgCloudKeycloakClientSpecTestFactory.createBuilder()
 				.clientId("testclient")
 				.build();
 		return mapper.map(client);
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/client/OzgKeycloakClientSpecProtocolMapperTestFactory.java b/src/test/java/de/ozgcloud/operator/keycloak/client/OzgCloudKeycloakClientSpecProtocolMapperTestFactory.java
similarity index 83%
rename from src/test/java/de/ozgcloud/operator/keycloak/client/OzgKeycloakClientSpecProtocolMapperTestFactory.java
rename to src/test/java/de/ozgcloud/operator/keycloak/client/OzgCloudKeycloakClientSpecProtocolMapperTestFactory.java
index 18606c4dc0907bb85bb98bc7cedecdce4b036d0c..f5f9d2e5879d0c99f68de00300c06ec98306465d 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/client/OzgKeycloakClientSpecProtocolMapperTestFactory.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/client/OzgCloudKeycloakClientSpecProtocolMapperTestFactory.java
@@ -25,7 +25,7 @@ package de.ozgcloud.operator.keycloak.client;
 
 import java.util.Map;
 
-public class OzgKeycloakClientSpecProtocolMapperTestFactory {
+public class OzgCloudKeycloakClientSpecProtocolMapperTestFactory {
 
 	public static final String NAME = "ProtocolMapperName";
 	public static final String PROTOCOL = "TestProcotol";
@@ -35,12 +35,12 @@ public class OzgKeycloakClientSpecProtocolMapperTestFactory {
 	public static final String CONFIG_VALUE_1 = "ConfigValue1";
 	public static final Map<String, String> CONFIG = Map.of(CONFIG_KEY_1, CONFIG_VALUE_1);
 
-	public static final OzgKeycloakClientSpec.ProtocolMapper create() {
+	public static final OzgCloudKeycloakClientSpec.ProtocolMapper create() {
 		return createBuilder().build();
 	}
 
-	public static final OzgKeycloakClientSpec.ProtocolMapper.ProtocolMapperBuilder createBuilder() {
-		return OzgKeycloakClientSpec.ProtocolMapper.builder()
+	public static final OzgCloudKeycloakClientSpec.ProtocolMapper.ProtocolMapperBuilder createBuilder() {
+		return OzgCloudKeycloakClientSpec.ProtocolMapper.builder()
 				.name(NAME)
 				.protocol(PROTOCOL)
 				.type(TYPE)
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/client/OzgKeycloakClientSpecTestFactory.java b/src/test/java/de/ozgcloud/operator/keycloak/client/OzgCloudKeycloakClientSpecTestFactory.java
similarity index 80%
rename from src/test/java/de/ozgcloud/operator/keycloak/client/OzgKeycloakClientSpecTestFactory.java
rename to src/test/java/de/ozgcloud/operator/keycloak/client/OzgCloudKeycloakClientSpecTestFactory.java
index 410971c63e3f5e2e147c19630e2d99ade4a1653c..a7fbfb7a07187d1bd2ccc410885a318a93ca17c8 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/client/OzgKeycloakClientSpecTestFactory.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/client/OzgCloudKeycloakClientSpecTestFactory.java
@@ -25,9 +25,9 @@ package de.ozgcloud.operator.keycloak.client;
 
 import java.util.List;
 
-import de.ozgcloud.operator.keycloak.client.OzgKeycloakClientSpec.ClientRole;
+import de.ozgcloud.operator.keycloak.client.OzgCloudKeycloakClientSpec.ClientRole;
 
-public class OzgKeycloakClientSpecTestFactory {
+public class OzgCloudKeycloakClientSpecTestFactory {
 
 	public static final String CLIENT_ID = "ClientName";
 	public static final String BASE_URL = "https://BaseUrl.local";
@@ -42,14 +42,14 @@ public class OzgKeycloakClientSpecTestFactory {
 	public static final ClientRole ROLE2 = ClientRole.builder().name(ROLE_NAME_2).build();
 	public static final List<ClientRole> ROLES = List.of(ROLE1);
 
-	public static final OzgKeycloakClientSpec.ProtocolMapper PROTOCOL_MAPPER_1 = OzgKeycloakClientSpecProtocolMapperTestFactory.create();
+	public static final OzgCloudKeycloakClientSpec.ProtocolMapper PROTOCOL_MAPPER_1 = OzgCloudKeycloakClientSpecProtocolMapperTestFactory.create();
 
-	public static final OzgKeycloakClientSpec create() {
+	public static final OzgCloudKeycloakClientSpec create() {
 		return createBuilder().build();
 	}
 
-	public static final OzgKeycloakClientSpec.OzgKeycloakClientSpecBuilder createBuilder() {
-		return OzgKeycloakClientSpec.builder()
+	public static final OzgCloudKeycloakClientSpec.OzgCloudKeycloakClientSpecBuilder createBuilder() {
+		return OzgCloudKeycloakClientSpec.builder()
 				.clientId(CLIENT_ID)
 				.baseUrl(BASE_URL)
 				.redirectUris(REDIRECT_URLS)
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/client/OzgKeycloakClientStatusTestFactory.java b/src/test/java/de/ozgcloud/operator/keycloak/client/OzgCloudKeycloakClientStatusTestFactory.java
similarity index 79%
rename from src/test/java/de/ozgcloud/operator/keycloak/client/OzgKeycloakClientStatusTestFactory.java
rename to src/test/java/de/ozgcloud/operator/keycloak/client/OzgCloudKeycloakClientStatusTestFactory.java
index 2c5b0e7006a51b1a3f73e5c2fa0e66e4616026b2..f1ba9d68e3050fa3ae55b0c9df390c5851d01d15 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/client/OzgKeycloakClientStatusTestFactory.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/client/OzgCloudKeycloakClientStatusTestFactory.java
@@ -23,13 +23,13 @@
  */
 package de.ozgcloud.operator.keycloak.client;
 
-public class OzgKeycloakClientStatusTestFactory {
+public class OzgCloudKeycloakClientStatusTestFactory {
 
-	public static final OzgKeycloakClientStatus create() {
+	public static final OzgCloudKeycloakClientStatus create() {
 		return createBuilder().build();
 	}
 
-	public static final OzgKeycloakClientStatus.OzgKeycloakClientStatusBuilder createBuilder() {
-		return OzgKeycloakClientStatus.builder();
+	public static final OzgCloudKeycloakClientStatus.OzgCloudKeycloakClientStatusBuilder createBuilder() {
+		return OzgCloudKeycloakClientStatus.builder();
 	}
 }
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/client/OzgKeycloakClientTestFactory.java b/src/test/java/de/ozgcloud/operator/keycloak/client/OzgCloudKeycloakClientTestFactory.java
similarity index 77%
rename from src/test/java/de/ozgcloud/operator/keycloak/client/OzgKeycloakClientTestFactory.java
rename to src/test/java/de/ozgcloud/operator/keycloak/client/OzgCloudKeycloakClientTestFactory.java
index e3742856eb4a02de2c6c6c40fe3532dff9de46d4..0cae318414dabf463c5f536fc5b21b492de38084 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/client/OzgKeycloakClientTestFactory.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/client/OzgCloudKeycloakClientTestFactory.java
@@ -23,15 +23,15 @@
  */
 package de.ozgcloud.operator.keycloak.client;
 
-public class OzgKeycloakClientTestFactory {
+public class OzgCloudKeycloakClientTestFactory {
 
-	public final static OzgKeycloakClientSpec SPEC = OzgKeycloakClientSpecTestFactory.create();
-	public final static OzgKeycloakClientStatus STATUS = OzgKeycloakClientStatusTestFactory.create();
+	public final static OzgCloudKeycloakClientSpec SPEC = OzgCloudKeycloakClientSpecTestFactory.create();
+	public final static OzgCloudKeycloakClientStatus STATUS = OzgCloudKeycloakClientStatusTestFactory.create();
 
 	public static final String METADATA_NAMESPACE = "TestNamespace";
 
-	public static OzgKeycloakClient create() {
-		var realm = new OzgKeycloakClient();
+	public static OzgCloudKeycloakClient create() {
+		var realm = new OzgCloudKeycloakClient();
 		realm.setSpec(SPEC);
 		realm.setStatus(STATUS);
 
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/client/RoleRepresentationTestFactory.java b/src/test/java/de/ozgcloud/operator/keycloak/client/RoleRepresentationTestFactory.java
index 106831969ddc1c13dbe98759318b1a8dc873e2ec..c0e70f655cbc66ff002411b0b494be2b009dcdd4 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/client/RoleRepresentationTestFactory.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/client/RoleRepresentationTestFactory.java
@@ -29,7 +29,7 @@ public class RoleRepresentationTestFactory {
 
 	public static RoleRepresentation create() {
 		var role = new RoleRepresentation();
-		role.setName(OzgKeycloakClientSpecTestFactory.ROLE_NAME_1);
+		role.setName(OzgCloudKeycloakClientSpecTestFactory.ROLE_NAME_1);
 
 		return role;
 	}
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/group/GroupRepresentationTestFactory.java b/src/test/java/de/ozgcloud/operator/keycloak/group/GroupRepresentationTestFactory.java
index c6a41f2d947c678491222c43f4e9da1e97134ef2..abd1f848d1a800b64568c54d77efd22db00144d6 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/group/GroupRepresentationTestFactory.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/group/GroupRepresentationTestFactory.java
@@ -29,7 +29,7 @@ public class GroupRepresentationTestFactory {
 
 	public static GroupRepresentation create() {
 		var group = new GroupRepresentation();
-		group.setName(OzgKeycloakGroupSpecTestFactory.NAME);
+		group.setName(OzgCloudKeycloakGroupSpecTestFactory.NAME);
 
 		return group;
 	}
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupMapperTest.java b/src/test/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupMapperTest.java
index 5129815e647ff35e05e91fc69dcdcdc76e7d5737..27b838f63573b8fa5f78d489c0c357d71f5d0685 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupMapperTest.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupMapperTest.java
@@ -42,18 +42,18 @@ class KeycloakGroupMapperTest {
 
 		@Test
 		void shouldMapName() {
-			var group = mapper.map(OzgKeycloakGroupSpecTestFactory.create());
+			var group = mapper.map(OzgCloudKeycloakGroupSpecTestFactory.create());
 
-			assertThat(group.getName()).isEqualTo(OzgKeycloakGroupSpecTestFactory.NAME);
+			assertThat(group.getName()).isEqualTo(OzgCloudKeycloakGroupSpecTestFactory.NAME);
 		}
 
 		@Test
 		void shouldMapGroupAttributes() {
-			var group = mapper.map(OzgKeycloakGroupSpecTestFactory.create());
+			var group = mapper.map(OzgCloudKeycloakGroupSpecTestFactory.create());
 
 			assertThat(group.getAttributes())
-					.hasFieldOrPropertyWithValue(OzgKeycloakGroupSpecAttributeTestFactory.NAME,
-							List.of(OzgKeycloakGroupSpecAttributeTestFactory.VALUE));
+					.hasFieldOrPropertyWithValue(OzgCloudKeycloakGroupSpecAttributeTestFactory.NAME,
+							List.of(OzgCloudKeycloakGroupSpecAttributeTestFactory.VALUE));
 		}
 	}
 }
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupPreconditionServiceTest.java b/src/test/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupPreconditionServiceTest.java
index f108288a62ade93808abd9702d895f1eebc4b0fb..748b9e1e3f93bd16d78dba8ebe3540bf92948385 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupPreconditionServiceTest.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupPreconditionServiceTest.java
@@ -51,16 +51,16 @@ class KeycloakGroupPreconditionServiceTest {
 		void shouldCallRealmExists() {
 			when(genericRemoteService.realmExists(any())).thenReturn(false);
 
-			service.getReconcilePreconditionErrors(OzgKeycloakGroupTestFactory.create());
+			service.getReconcilePreconditionErrors(OzgCloudKeycloakGroupTestFactory.create());
 
-			verify(genericRemoteService).realmExists(OzgKeycloakGroupTestFactory.METADATA_NAMESPACE);
+			verify(genericRemoteService).realmExists(OzgCloudKeycloakGroupTestFactory.METADATA_NAMESPACE);
 		}
 
 		@Test
 		void shouldReturnErrorIfRealmNotExists() {
 			doReturn(false).when(genericRemoteService).realmExists(anyString());
 
-			var response = service.getReconcilePreconditionErrors(OzgKeycloakGroupTestFactory.create());
+			var response = service.getReconcilePreconditionErrors(OzgCloudKeycloakGroupTestFactory.create());
 
 			assertThat(response).isPresent();
 		}
@@ -69,7 +69,7 @@ class KeycloakGroupPreconditionServiceTest {
 		void shouldReturnEmptyIfRealmExists() {
 			doReturn(true).when(genericRemoteService).realmExists(anyString());
 
-			var response = service.getReconcilePreconditionErrors(OzgKeycloakGroupTestFactory.create());
+			var response = service.getReconcilePreconditionErrors(OzgCloudKeycloakGroupTestFactory.create());
 
 			assertThat(response).isEmpty();
 		}
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupReconcilerTest.java b/src/test/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupReconcilerTest.java
index 7af5824a52223e714f9e8199d5d54a2c4320ecc3..c4eca85fbecda61936da1891720e9ebf3fdb9863 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupReconcilerTest.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupReconcilerTest.java
@@ -35,7 +35,7 @@ import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.Spy;
 
-import de.ozgcloud.operator.keycloak.OzgCustomResourceStatus;
+import de.ozgcloud.operator.keycloak.OzgCloudCustomResourceStatus;
 
 class KeycloakGroupReconcilerTest {
 
@@ -56,54 +56,34 @@ class KeycloakGroupReconcilerTest {
 
 		@Test
 		void shouldCallServiceAddGroup() {
-			OzgKeycloakGroup group = OzgKeycloakGroupTestFactory.create();
+			OzgCloudKeycloakGroup group = OzgCloudKeycloakGroupTestFactory.create();
 
 			reconciler.reconcile(group, null);
 
-			verify(service).createGroup(group.getSpec(), OzgKeycloakGroupTestFactory.METADATA_NAMESPACE);
+			verify(service).createGroup(group.getSpec(), OzgCloudKeycloakGroupTestFactory.METADATA_NAMESPACE);
 		}
 
 		@Test
 		void shouldReturnUpdateStatus() {
-			var response = reconciler.reconcile(OzgKeycloakGroupTestFactory.create(), null);
+			var response = reconciler.reconcile(OzgCloudKeycloakGroupTestFactory.create(), null);
 
 			assertThat(response.getResource()).isNotNull();
 		}
 
 		@Test
 		void shouldSetStatusOk() {
-			var response = reconciler.reconcile(OzgKeycloakGroupTestFactory.create(), null);
+			var response = reconciler.reconcile(OzgCloudKeycloakGroupTestFactory.create(), null);
 
-			assertThat(response.getResource().getStatus().getStatus()).isEqualTo(OzgCustomResourceStatus.OK);
+			assertThat(response.getResource().getStatus().getStatus()).isEqualTo(OzgCloudCustomResourceStatus.OK);
 		}
 
 		@Test
 		void shouldReturnInProgressStatusIfPreconditionsNotMet() {
 			when(preconditionService.getReconcilePreconditionErrors(any())).thenReturn(Optional.of(ERROR_MESSAGE));
 
-			var response = reconciler.reconcile(OzgKeycloakGroupTestFactory.create(), null);
+			var response = reconciler.reconcile(OzgCloudKeycloakGroupTestFactory.create(), null);
 
-			assertThat(response.getResource().getStatus().getStatus()).isEqualTo(OzgCustomResourceStatus.IN_PROGRESS);
+			assertThat(response.getResource().getStatus().getStatus()).isEqualTo(OzgCloudCustomResourceStatus.IN_PROGRESS);
 		}
 	}
-
-//	@Nested
-//	class TestUpdateErrorStatus {
-//
-//		@Test
-//		void shouldSetErrorStatus() {
-//			var response = reconciler.updateErrorStatus(OzgKeycloakGroupTestFactory.create(), null, new RuntimeException(ERROR_MESSAGE));
-//
-//			assertThat(response.getResource()).isPresent().map(OzgKeycloakGroup::getStatus).map(OzgKeycloakGroupStatus::getStatus)
-//					.contains(OzgCustomResourceStatus.ERROR);
-//		}
-//
-//		@Test
-//		void shouldSetMessage() {
-//			var response = reconciler.updateErrorStatus(OzgKeycloakGroupTestFactory.create(), null, new RuntimeException(ERROR_MESSAGE));
-//
-//			assertThat(response.getResource()).isPresent().map(OzgKeycloakGroup::getStatus).map(OzgKeycloakGroupStatus::getMessage)
-//					.contains(ERROR_MESSAGE);
-//		}
-//	}
 }
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupRemoteServiceTest.java b/src/test/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupRemoteServiceTest.java
index c7598a8a4621a2b07a65103c3d19d8b46fe04c74..1303467ed34a87703ea569e4f7547c3590930b55 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupRemoteServiceTest.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupRemoteServiceTest.java
@@ -74,9 +74,9 @@ class KeycloakGroupRemoteServiceTest {
 
 		@Test
 		void shouldReturnExistingGroup() {
-			when(groupRepresentation.getName()).thenReturn(OzgKeycloakGroupSpecTestFactory.NAME);
+			when(groupRepresentation.getName()).thenReturn(OzgCloudKeycloakGroupSpecTestFactory.NAME);
 
-			var rsp = service.getGroupByName(OzgKeycloakGroupSpecTestFactory.NAME, REALM);
+			var rsp = service.getGroupByName(OzgCloudKeycloakGroupSpecTestFactory.NAME, REALM);
 
 			assertThat(rsp).isPresent();
 		}
@@ -85,7 +85,7 @@ class KeycloakGroupRemoteServiceTest {
 		void shouldReturnEmptyOnMissingGroup() {
 			when(groupsResource.groups()).thenReturn(Collections.emptyList());
 
-			var rsp = service.getGroupByName(OzgKeycloakGroupSpecTestFactory.NAME, REALM);
+			var rsp = service.getGroupByName(OzgCloudKeycloakGroupSpecTestFactory.NAME, REALM);
 
 			assertThat(rsp).isEmpty();
 		}
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupServiceTest.java b/src/test/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupServiceTest.java
index 4a2ca34fb73e24c3a86f4ad756476263d15e37a3..1bc024a25ae520702044b8efa4a72640845a541a 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupServiceTest.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/group/KeycloakGroupServiceTest.java
@@ -57,14 +57,14 @@ class KeycloakGroupServiceTest {
 			var groupRepresentation = GroupRepresentationTestFactory.create();
 			when(mapper.map(any())).thenReturn(groupRepresentation);
 
-			service.createGroup(OzgKeycloakGroupSpecTestFactory.create(), REALM);
+			service.createGroup(OzgCloudKeycloakGroupSpecTestFactory.create(), REALM);
 
-			verify(remoteService).getGroupByName(OzgKeycloakGroupSpecTestFactory.NAME, REALM);
+			verify(remoteService).getGroupByName(OzgCloudKeycloakGroupSpecTestFactory.NAME, REALM);
 		}
 
 		@Test
 		void shouldCallMapper() {
-			var group = OzgKeycloakGroupSpecTestFactory.create();
+			var group = OzgCloudKeycloakGroupSpecTestFactory.create();
 			service.createGroup(group, REALM);
 
 			verify(mapper).map(group);
@@ -72,9 +72,9 @@ class KeycloakGroupServiceTest {
 
 		@Test
 		void shouldCreateGroupIfNotExists() {
-			var ozgGroup = OzgKeycloakGroupSpecTestFactory.create();
+			var ozgGroup = OzgCloudKeycloakGroupSpecTestFactory.create();
 			var groupRepresentation = GroupRepresentationTestFactory.create();
-			when(remoteService.getGroupByName(OzgKeycloakGroupSpecTestFactory.NAME, REALM)).thenReturn(Optional.empty());
+			when(remoteService.getGroupByName(OzgCloudKeycloakGroupSpecTestFactory.NAME, REALM)).thenReturn(Optional.empty());
 			when(mapper.map(ozgGroup)).thenReturn(groupRepresentation);
 
 			service.createGroup(ozgGroup, REALM);
@@ -84,8 +84,8 @@ class KeycloakGroupServiceTest {
 
 		@Test
 		void shouldNotCreateGroupIfAlreadyExists() {
-			var ozgGroup = OzgKeycloakGroupSpecTestFactory.create();
-			when(remoteService.getGroupByName(OzgKeycloakGroupSpecTestFactory.NAME, REALM)).thenReturn(Optional.of(mock(GroupRepresentation.class)));
+			var ozgGroup = OzgCloudKeycloakGroupSpecTestFactory.create();
+			when(remoteService.getGroupByName(OzgCloudKeycloakGroupSpecTestFactory.NAME, REALM)).thenReturn(Optional.of(mock(GroupRepresentation.class)));
 			when(mapper.map(ozgGroup)).thenReturn(GroupRepresentationTestFactory.create());
 
 			service.createGroup(ozgGroup, REALM);
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/group/KeycloakLivelTest.java b/src/test/java/de/ozgcloud/operator/keycloak/group/KeycloakLivelTest.java
index d3da27f065c1d5d6442fd99e02f868cf290aca2b..91ccd1f7ba8e7805522aeaca4bce060169221114 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/group/KeycloakLivelTest.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/group/KeycloakLivelTest.java
@@ -41,6 +41,8 @@ import lombok.extern.java.Log;
 @Log
 @ExtendWith(SpringExtension.class)
 class KeycloakLivelTest {
+	
+	private static final String NAMESPACE = "by-torsten-ozgcloud-keycloak-operator-dev";
 
 	@Spy
 	@InjectMocks
@@ -65,11 +67,11 @@ class KeycloakLivelTest {
 
 		FieldUtils.writeField(remoteService, "keycloak", kc, true);
 
-		remoteService.createGroup(createGroup(), "by-torsten-ozg-operator-dev");
-		log.info("Hase: " + remoteService.getGroupByName("hase", "by-torsten-ozg-operator-dev"));
-		log.info("Maus: " + remoteService.getGroupByName("maus", "by-torsten-ozg-operator-dev"));
+		remoteService.createGroup(createGroup(), NAMESPACE);
+		log.info("Hase: " + remoteService.getGroupByName("hase", NAMESPACE));
+		log.info("Maus: " + remoteService.getGroupByName("maus", NAMESPACE));
 
-		service.createGroup(OzgKeycloakGroupSpec.builder().name("Fuchs").build(), "by-torsten-ozg-operator-dev");
+		service.createGroup(OzgCloudKeycloakGroupSpec.builder().name("Fuchs").build(), NAMESPACE);
 	}
 
 	private GroupRepresentation createGroup() {
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/group/OzgKeycloakGroupSpecAttributeTestFactory.java b/src/test/java/de/ozgcloud/operator/keycloak/group/OzgCloudKeycloakGroupSpecAttributeTestFactory.java
similarity index 81%
rename from src/test/java/de/ozgcloud/operator/keycloak/group/OzgKeycloakGroupSpecAttributeTestFactory.java
rename to src/test/java/de/ozgcloud/operator/keycloak/group/OzgCloudKeycloakGroupSpecAttributeTestFactory.java
index ef1bdc16dd5bf0eff45b10b90908f8435e1113b8..2e5558e0281a7e8213af6866f21a7b9610ef0558 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/group/OzgKeycloakGroupSpecAttributeTestFactory.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/group/OzgCloudKeycloakGroupSpecAttributeTestFactory.java
@@ -23,17 +23,17 @@
  */
 package de.ozgcloud.operator.keycloak.group;
 
-public class OzgKeycloakGroupSpecAttributeTestFactory {
+public class OzgCloudKeycloakGroupSpecAttributeTestFactory {
 
 	public static final String NAME = "AttributeName";
 	public static final String VALUE = "AttributeValue";
 
-	public static OzgKeycloakGroupSpec.Attribute create() {
+	public static OzgCloudKeycloakGroupSpec.Attribute create() {
 		return createBuilder().build();
 	}
 
-	public static OzgKeycloakGroupSpec.Attribute.AttributeBuilder createBuilder() {
-		return OzgKeycloakGroupSpec.Attribute.builder()
+	public static OzgCloudKeycloakGroupSpec.Attribute.AttributeBuilder createBuilder() {
+		return OzgCloudKeycloakGroupSpec.Attribute.builder()
 				.name(NAME)
 				.value(VALUE);
 	}
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/group/OzgKeycloakGroupSpecTestFactory.java b/src/test/java/de/ozgcloud/operator/keycloak/group/OzgCloudKeycloakGroupSpecTestFactory.java
similarity index 77%
rename from src/test/java/de/ozgcloud/operator/keycloak/group/OzgKeycloakGroupSpecTestFactory.java
rename to src/test/java/de/ozgcloud/operator/keycloak/group/OzgCloudKeycloakGroupSpecTestFactory.java
index 744a44ff324b620d1d25ffc78f874a6be490ab8b..718138374a54c3247feea87f25ede66e0020a5bc 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/group/OzgKeycloakGroupSpecTestFactory.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/group/OzgCloudKeycloakGroupSpecTestFactory.java
@@ -25,17 +25,17 @@ package de.ozgcloud.operator.keycloak.group;
 
 import java.util.List;
 
-public class OzgKeycloakGroupSpecTestFactory {
+public class OzgCloudKeycloakGroupSpecTestFactory {
 
 	public static final String NAME = "GroupName";
 
-	public static OzgKeycloakGroupSpec create() {
+	public static OzgCloudKeycloakGroupSpec create() {
 		return createBuilder().build();
 	}
 
-	public static OzgKeycloakGroupSpec.OzgKeycloakGroupSpecBuilder createBuilder() {
-		return OzgKeycloakGroupSpec.builder()
+	public static OzgCloudKeycloakGroupSpec.OzgCloudKeycloakGroupSpecBuilder createBuilder() {
+		return OzgCloudKeycloakGroupSpec.builder()
 				.name(NAME)
-				.attributes(List.of(OzgKeycloakGroupSpecAttributeTestFactory.create()));
+				.attributes(List.of(OzgCloudKeycloakGroupSpecAttributeTestFactory.create()));
 	}
 }
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/group/OzgKeycloakGroupTestFactory.java b/src/test/java/de/ozgcloud/operator/keycloak/group/OzgCloudKeycloakGroupTestFactory.java
similarity index 81%
rename from src/test/java/de/ozgcloud/operator/keycloak/group/OzgKeycloakGroupTestFactory.java
rename to src/test/java/de/ozgcloud/operator/keycloak/group/OzgCloudKeycloakGroupTestFactory.java
index e97a9b0be66fcb32b8a33d1931bf10f3d3cf8d59..08601b03c7a72d5a9d406f6e6bf60abad2337aac 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/group/OzgKeycloakGroupTestFactory.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/group/OzgCloudKeycloakGroupTestFactory.java
@@ -23,14 +23,14 @@
  */
 package de.ozgcloud.operator.keycloak.group;
 
-public class OzgKeycloakGroupTestFactory {
+public class OzgCloudKeycloakGroupTestFactory {
 
 	public static final String METADATA_NAMESPACE = "TestNameSpace";
 
-	public static OzgKeycloakGroup create() {
-		var group = new OzgKeycloakGroup();
-		group.setSpec(OzgKeycloakGroupSpecTestFactory.create());
-		group.setStatus(OzgKeycloakGroupStatus.builder().build());
+	public static OzgCloudKeycloakGroup create() {
+		var group = new OzgCloudKeycloakGroup();
+		group.setSpec(OzgCloudKeycloakGroupSpecTestFactory.create());
+		group.setStatus(OzgCloudKeycloakGroupStatus.builder().build());
 		group.getMetadata().setNamespace(METADATA_NAMESPACE);
 
 		return group;
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmMapperTest.java b/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmMapperTest.java
index 1d5acfe4003b41decd096b190369b868286c73fc..92de72339804e82685cef9601a9bbc983d068ebe 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmMapperTest.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmMapperTest.java
@@ -36,49 +36,49 @@ class KeycloakRealmMapperTest {
 
 	@Test
 	void shouldMapDisplayName() {
-		var mapped = mapper.map(OzgKeycloakRealmSpecTestFactory.create());
+		var mapped = mapper.map(OzgCloudKeycloakRealmSpecTestFactory.create());
 
-		assertThat(mapped.getDisplayName()).isEqualTo(OzgKeycloakRealmSpecTestFactory.DISPLAY_NAME);
+		assertThat(mapped.getDisplayName()).isEqualTo(OzgCloudKeycloakRealmSpecTestFactory.DISPLAY_NAME);
 	}
 
 	@Test
 	void shouldBeEnabled() {
-		var mapped = mapper.map(OzgKeycloakRealmSpecTestFactory.create());
+		var mapped = mapper.map(OzgCloudKeycloakRealmSpecTestFactory.create());
 
 		assertThat(mapped.isEnabled()).isTrue();
 	}
 
 	@Test
 	void shouldBeResetPasswordAllowed() {
-		var mapped = mapper.map(OzgKeycloakRealmSpecTestFactory.create());
+		var mapped = mapper.map(OzgCloudKeycloakRealmSpecTestFactory.create());
 
 		assertThat(mapped.isResetPasswordAllowed()).isTrue();
 	}
 
 	@Test
 	void shouldBeSupportedLocaleDe() {
-		var mapped = mapper.map(OzgKeycloakRealmSpecTestFactory.create());
+		var mapped = mapper.map(OzgCloudKeycloakRealmSpecTestFactory.create());
 
 		assertThat(mapped.getSupportedLocales()).containsExactly("de");
 	}
 
 	@Test
 	void shouldBeDefaultLocaleDe() {
-		var mapped = mapper.map(OzgKeycloakRealmSpecTestFactory.create());
+		var mapped = mapper.map(OzgCloudKeycloakRealmSpecTestFactory.create());
 
 		assertThat(mapped.getDefaultLocale()).isEqualTo("de");
 	}
 
 	@Test
 	void shouldBeInternationalizationEnabled() {
-		var mapped = mapper.map(OzgKeycloakRealmSpecTestFactory.create());
+		var mapped = mapper.map(OzgCloudKeycloakRealmSpecTestFactory.create());
 
 		assertThat(mapped.isInternationalizationEnabled()).isTrue();
 	}
 
 	@Test
 	void checkPasswordPolicy() {
-		var mapped = mapper.map(OzgKeycloakRealmSpecTestFactory.create());
+		var mapped = mapper.map(OzgCloudKeycloakRealmSpecTestFactory.create());
 
 		assertThat(mapped.getPasswordPolicy()).isEqualTo("upperCase(1) and lowerCase(1) and length(8) and notUsername");
 	}
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmReconcilerTest.java b/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmReconcilerTest.java
index 0dc7d458a9d6b86babd1e0ae01de1e84ace55373..bdcffd897a0df6b6e0f81b27a332d28922ae2d44 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmReconcilerTest.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmReconcilerTest.java
@@ -33,7 +33,7 @@ import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.Spy;
 
-import de.ozgcloud.operator.keycloak.OzgCustomResourceStatus;
+import de.ozgcloud.operator.keycloak.OzgCloudCustomResourceStatus;
 import io.javaoperatorsdk.operator.api.reconciler.DeleteControl;
 
 class KeycloakRealmReconcilerTest {
@@ -51,25 +51,25 @@ class KeycloakRealmReconcilerTest {
 
 		@Test
 		void shouldCallServiceAddRealm() {
-			OzgKeycloakRealm realm = OzgKeycloakRealmTestFactory.create();
+			OzgCloudKeycloakRealm realm = OzgCloudKeycloakRealmTestFactory.create();
 
 			reconciler.reconcile(realm, null);
 
-			verify(service).createRealm(realm.getSpec(), OzgKeycloakRealmTestFactory.METADATA_NAMESPACE);
+			verify(service).createRealm(realm.getSpec(), OzgCloudKeycloakRealmTestFactory.METADATA_NAMESPACE);
 		}
 
 		@Test
 		void shouldReturnUpdateStatus() {
-			var response = reconciler.reconcile(OzgKeycloakRealmTestFactory.create(), null);
+			var response = reconciler.reconcile(OzgCloudKeycloakRealmTestFactory.create(), null);
 
 			assertThat(response.getResource()).isNotNull();
 		}
 
 		@Test
 		void shouldSetStatusOk() {
-			var response = reconciler.reconcile(OzgKeycloakRealmTestFactory.create(), null);
+			var response = reconciler.reconcile(OzgCloudKeycloakRealmTestFactory.create(), null);
 
-			assertThat(response.getResource().getStatus().getStatus()).isEqualTo(OzgCustomResourceStatus.OK);
+			assertThat(response.getResource().getStatus().getStatus()).isEqualTo(OzgCloudCustomResourceStatus.OK);
 		}
 	}
 
@@ -81,14 +81,14 @@ class KeycloakRealmReconcilerTest {
 		@Nested
 		class TestWithKeepAfterDelete {
 
-			private final OzgKeycloakRealmSpec realmSpec = OzgKeycloakRealmSpecTestFactory.createBuilder().keepAfterDelete(true).build();
-			private final OzgKeycloakRealm realm = OzgKeycloakRealmTestFactory.create(realmSpec);
+			private final OzgCloudKeycloakRealmSpec realmSpec = OzgCloudKeycloakRealmSpecTestFactory.createBuilder().keepAfterDelete(true).build();
+			private final OzgCloudKeycloakRealm realm = OzgCloudKeycloakRealmTestFactory.create(realmSpec);
 
 			@Test
 			void shouldNotCallService() {
 				reconciler.cleanup(realm, null);
 
-				verify(service, never()).deleteRealm(OzgKeycloakRealmTestFactory.METADATA_NAMESPACE);
+				verify(service, never()).deleteRealm(OzgCloudKeycloakRealmTestFactory.METADATA_NAMESPACE);
 			}
 
 			@Test
@@ -101,11 +101,11 @@ class KeycloakRealmReconcilerTest {
 
 		@Test
 		void shouldCallServiceDelete() {
-			var realm = OzgKeycloakRealmTestFactory.create();
+			var realm = OzgCloudKeycloakRealmTestFactory.create();
 
 			reconciler.cleanup(realm);
 
-			verify(service).deleteRealm(OzgKeycloakRealmTestFactory.METADATA_NAMESPACE);
+			verify(service).deleteRealm(OzgCloudKeycloakRealmTestFactory.METADATA_NAMESPACE);
 		}
 	}
 }
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmServiceTest.java b/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmServiceTest.java
index 93d2915c59ecffd5b028bb3d2b4971d0db01d4b3..529dd38008b6142b3e37ee6a02ac590ae3833124 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmServiceTest.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmServiceTest.java
@@ -38,7 +38,7 @@ import de.ozgcloud.operator.keycloak.KeycloakGenericRemoteService;
 
 class KeycloakRealmServiceTest {
 
-	private static final OzgKeycloakRealmSpec REALM = OzgKeycloakRealmSpecTestFactory.create();
+	private static final OzgCloudKeycloakRealmSpec REALM = OzgCloudKeycloakRealmSpecTestFactory.create();
 	private static final String REALM_NAME = "TestRealmName";
 
 	@Spy
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/realm/OzgKeycloakRealmSpecTestFactory.java b/src/test/java/de/ozgcloud/operator/keycloak/realm/OzgCloudKeycloakRealmSpecTestFactory.java
similarity index 83%
rename from src/test/java/de/ozgcloud/operator/keycloak/realm/OzgKeycloakRealmSpecTestFactory.java
rename to src/test/java/de/ozgcloud/operator/keycloak/realm/OzgCloudKeycloakRealmSpecTestFactory.java
index 52063fb17a6f1465f3a38cab0af5ffc8520628f1..fe23573b6987541b5246e82bf9a6c8ceb9267fe4 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/realm/OzgKeycloakRealmSpecTestFactory.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/realm/OzgCloudKeycloakRealmSpecTestFactory.java
@@ -23,17 +23,17 @@
  */
 package de.ozgcloud.operator.keycloak.realm;
 
-public class OzgKeycloakRealmSpecTestFactory {
+public class OzgCloudKeycloakRealmSpecTestFactory {
 
 	public final static String DISPLAY_NAME = "TestDisplayName";
 	public final static boolean KEEP_AFTER_DELETE = false;
 
-	public static OzgKeycloakRealmSpec create() {
+	public static OzgCloudKeycloakRealmSpec create() {
 		return createBuilder().build();
 	}
 
-	public static OzgKeycloakRealmSpec.OzgKeycloakRealmSpecBuilder createBuilder() {
-		return OzgKeycloakRealmSpec.builder()
+	public static OzgCloudKeycloakRealmSpec.OzgCloudKeycloakRealmSpecBuilder createBuilder() {
+		return OzgCloudKeycloakRealmSpec.builder()
 				.keepAfterDelete(KEEP_AFTER_DELETE)
 				.displayName(DISPLAY_NAME);
 	}
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/realm/OzgKeycloakRealmStatusTestFactory.java b/src/test/java/de/ozgcloud/operator/keycloak/realm/OzgCloudKeycloakRealmStatusTestFactory.java
similarity index 80%
rename from src/test/java/de/ozgcloud/operator/keycloak/realm/OzgKeycloakRealmStatusTestFactory.java
rename to src/test/java/de/ozgcloud/operator/keycloak/realm/OzgCloudKeycloakRealmStatusTestFactory.java
index 372307ba7c9619969f170173e47a09682dab9b13..d8a8e54ad9cc4c0529c4bde906f6eb45f89b0d3b 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/realm/OzgKeycloakRealmStatusTestFactory.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/realm/OzgCloudKeycloakRealmStatusTestFactory.java
@@ -23,13 +23,13 @@
  */
 package de.ozgcloud.operator.keycloak.realm;
 
-public class OzgKeycloakRealmStatusTestFactory {
+public class OzgCloudKeycloakRealmStatusTestFactory {
 
-	public static OzgKeycloakRealmStatus create() {
+	public static OzgCloudKeycloakRealmStatus create() {
 		return createBuilder().build();
 	}
 
-	public static OzgKeycloakRealmStatus.OzgKeycloakRealmStatusBuilder createBuilder() {
-		return OzgKeycloakRealmStatus.builder();
+	public static OzgCloudKeycloakRealmStatus.OzgCloudKeycloakRealmStatusBuilder createBuilder() {
+		return OzgCloudKeycloakRealmStatus.builder();
 	}
 }
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/realm/OzgKeycloakRealmTestFactory.java b/src/test/java/de/ozgcloud/operator/keycloak/realm/OzgCloudKeycloakRealmTestFactory.java
similarity index 73%
rename from src/test/java/de/ozgcloud/operator/keycloak/realm/OzgKeycloakRealmTestFactory.java
rename to src/test/java/de/ozgcloud/operator/keycloak/realm/OzgCloudKeycloakRealmTestFactory.java
index 08df37af33ce01660554ce49115646d855b38c07..2c2f7ed246b6a2aa65277b8325823dec7ad669d2 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/realm/OzgKeycloakRealmTestFactory.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/realm/OzgCloudKeycloakRealmTestFactory.java
@@ -23,22 +23,22 @@
  */
 package de.ozgcloud.operator.keycloak.realm;
 
-public class OzgKeycloakRealmTestFactory {
+public class OzgCloudKeycloakRealmTestFactory {
 
 	public static final String METADATA_NAMESPACE = "TestNamespace";
 
-	public static OzgKeycloakRealm create() {
-		return createWithSpec(OzgKeycloakRealmSpecTestFactory.create());
+	public static OzgCloudKeycloakRealm create() {
+		return createWithSpec(OzgCloudKeycloakRealmSpecTestFactory.create());
 	}
 
-	public static OzgKeycloakRealm create(OzgKeycloakRealmSpec spec) {
+	public static OzgCloudKeycloakRealm create(OzgCloudKeycloakRealmSpec spec) {
 		return createWithSpec(spec);
 	}
 
-	private static OzgKeycloakRealm createWithSpec(OzgKeycloakRealmSpec spec) {
-		var realm = new OzgKeycloakRealm();
+	private static OzgCloudKeycloakRealm createWithSpec(OzgCloudKeycloakRealmSpec spec) {
+		var realm = new OzgCloudKeycloakRealm();
 		realm.setSpec(spec);
-		realm.setStatus(OzgKeycloakRealmStatusTestFactory.create());
+		realm.setStatus(OzgCloudKeycloakRealmStatusTestFactory.create());
 		realm.getMetadata().setNamespace(METADATA_NAMESPACE);
 
 		return realm;
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakLivelTest.java b/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakLivelTest.java
index 15570eddeb40c769e2c8553d8b0ad24c85393569..b43f2a316927c57f42800c83a5240f4f34a6044d 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakLivelTest.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakLivelTest.java
@@ -56,7 +56,7 @@ class KeycloakLivelTest {
 		FieldUtils.writeField(userRemoteService, "keycloak", kc, true);
 //		when(keycloakClient.getKeycloak()).thenReturn(kc);
 
-		userRemoteService.createUser(createUser(), "by-torsten-ozg-operator-dev");
+		userRemoteService.createUser(createUser(), "by-torsten-ozgcloud-keycloak-operator-dev");
 	}
 
 	private UserRepresentation createUser() {
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserMapperTest.java b/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserMapperTest.java
index bfc36ce848a539f355c37922618a6240f80f9466..713371f41f52e628f194be7844607bc4fc6e4361 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserMapperTest.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserMapperTest.java
@@ -35,7 +35,7 @@ import org.mockito.Spy;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import de.ozgcloud.operator.keycloak.user.OzgKeycloakUserSpec.KeycloakUserSpecUser;
+import de.ozgcloud.operator.keycloak.user.OzgCloudKeycloakUserSpec.KeycloakUserSpecUser;
 import lombok.SneakyThrows;
 
 class KeycloakUserMapperTest {
@@ -134,7 +134,7 @@ class KeycloakUserMapperTest {
 		}
 
 		private UserRepresentation map() {
-			return mapper.map(OzgKeycloakUserSpecTestFactory.create());
+			return mapper.map(OzgCloudKeycloakUserSpecTestFactory.create());
 		}
 	}
 
@@ -144,7 +144,7 @@ class KeycloakUserMapperTest {
 
 		@Test
 		void shouldHaveSize() {
-			var clientRoles = OzgKeycloakUserSpecTestFactory.create().getKeycloakUser().getClientRoles();
+			var clientRoles = OzgCloudKeycloakUserSpecTestFactory.create().getKeycloakUser().getClientRoles();
 
 			var mappedRoles = mapper.mapClientRoles(clientRoles);
 
@@ -153,7 +153,7 @@ class KeycloakUserMapperTest {
 
 		@Test
 		void shouldContainsKey() {
-			var clientRoles = OzgKeycloakUserSpecTestFactory.create().getKeycloakUser().getClientRoles();
+			var clientRoles = OzgCloudKeycloakUserSpecTestFactory.create().getKeycloakUser().getClientRoles();
 
 			var mappedRoles = mapper.mapClientRoles(clientRoles);
 
@@ -162,7 +162,7 @@ class KeycloakUserMapperTest {
 
 		@Test
 		void shouldContainsRoleList() {
-			var clientRoles = OzgKeycloakUserSpecTestFactory.create().getKeycloakUser().getClientRoles();
+			var clientRoles = OzgCloudKeycloakUserSpecTestFactory.create().getKeycloakUser().getClientRoles();
 
 			var mappedRoles = mapper.mapClientRoles(clientRoles);
 
@@ -206,7 +206,7 @@ class KeycloakUserMapperTest {
 			var userRepresentation = UserRepresentationTestFactory.create();
 			userRepresentation.setFirstName(FIRSTNAME2);
 
-			var keycloakUser = mapper.update(userRepresentation, OzgKeycloakUserSpecTestFactory.create());
+			var keycloakUser = mapper.update(userRepresentation, OzgCloudKeycloakUserSpecTestFactory.create());
 
 			assertThat(keycloakUser.getFirstName()).isEqualTo(KeycloakUserSpecUserTestFactory.FIRSTNAME);
 		}
@@ -216,7 +216,7 @@ class KeycloakUserMapperTest {
 			var userRepresentation = UserRepresentationTestFactory.create();
 			userRepresentation.setId(USERID);
 
-			var keycloakUser = mapper.update(userRepresentation, OzgKeycloakUserSpecTestFactory.create());
+			var keycloakUser = mapper.update(userRepresentation, OzgCloudKeycloakUserSpecTestFactory.create());
 
 			assertThat(keycloakUser.getId()).isEqualTo(USERID);
 		}
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserPreconditionServiceTest.java b/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserPreconditionServiceTest.java
index 2dc90dacdcaee82639df55cf88fbf847a3c45720..f8088d59e805b0419cbef1588af4ee1e936f8b1a 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserPreconditionServiceTest.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserPreconditionServiceTest.java
@@ -65,16 +65,16 @@ class KeycloakUserPreconditionServiceTest {
 
 		@Test
 		void shouldCallRealmExiststest() {
-			service.getPreconditionErrors(OzgKeycloakUserTestFactory.create());
+			service.getPreconditionErrors(OzgCloudKeycloakUserTestFactory.create());
 
-			verify(keycloakGenericRemoteService).realmExists(OzgKeycloakUserTestFactory.METADATA_NAMESPACE);
+			verify(keycloakGenericRemoteService).realmExists(OzgCloudKeycloakUserTestFactory.METADATA_NAMESPACE);
 		}
 
 		@Test
 		void shouldReturnErrorIfRealmNotExists() {
 			doReturn(false).when(keycloakGenericRemoteService).realmExists(anyString());
 
-			var response = service.getPreconditionErrors(OzgKeycloakUserTestFactory.create());
+			var response = service.getPreconditionErrors(OzgCloudKeycloakUserTestFactory.create());
 
 			assertThat(response).isPresent();
 		}
@@ -85,7 +85,7 @@ class KeycloakUserPreconditionServiceTest {
 			doReturn(Optional.empty()).when(service).clientsExists(any(), any());
 			doReturn(Optional.empty()).when(service).groupsExists(any(), any());
 
-			var response = service.getPreconditionErrors(OzgKeycloakUserTestFactory.create());
+			var response = service.getPreconditionErrors(OzgCloudKeycloakUserTestFactory.create());
 
 			assertThat(response).isEmpty();
 		}
@@ -94,22 +94,22 @@ class KeycloakUserPreconditionServiceTest {
 		void shouldCheckIfKeycloakClientExists() {
 			doReturn(true).when(keycloakGenericRemoteService).realmExists(anyString());
 			doReturn(Optional.empty()).when(service).clientsExists(any(), any());
-			var user = OzgKeycloakUserTestFactory.create();
+			var user = OzgCloudKeycloakUserTestFactory.create();
 
 			service.getPreconditionErrors(user);
 
-			verify(service).clientsExists(eq(user), eq(OzgKeycloakUserTestFactory.METADATA_NAMESPACE));
+			verify(service).clientsExists(eq(user), eq(OzgCloudKeycloakUserTestFactory.METADATA_NAMESPACE));
 		}
 
 		@Test
 		void shouldCheckIfGroupsExists() {
 			doReturn(true).when(keycloakGenericRemoteService).realmExists(anyString());
 			doReturn(Optional.empty()).when(service).clientsExists(any(), any());
-			var user = OzgKeycloakUserTestFactory.create();
+			var user = OzgCloudKeycloakUserTestFactory.create();
 
 			service.getPreconditionErrors(user);
 
-			verify(service).groupsExists(eq(user), eq(OzgKeycloakUserTestFactory.METADATA_NAMESPACE));
+			verify(service).groupsExists(eq(user), eq(OzgCloudKeycloakUserTestFactory.METADATA_NAMESPACE));
 		}
 	}
 
@@ -120,7 +120,7 @@ class KeycloakUserPreconditionServiceTest {
 		void shouldRespondMissingRealm() {
 			when(keycloakGenericRemoteService.getByClientId(any(), any())).thenReturn(Optional.empty());
 
-			var rsp = service.clientsExists(OzgKeycloakUserTestFactory.create(), null);
+			var rsp = service.clientsExists(OzgCloudKeycloakUserTestFactory.create(), null);
 
 			assertThat(rsp).isPresent();
 		}
@@ -129,7 +129,7 @@ class KeycloakUserPreconditionServiceTest {
 		void shouldReturnClientExists() {
 			when(keycloakGenericRemoteService.getByClientId(any(), any())).thenReturn(Optional.of(mock(ClientRepresentation.class)));
 
-			var rsp = service.clientsExists(OzgKeycloakUserTestFactory.create(), null);
+			var rsp = service.clientsExists(OzgCloudKeycloakUserTestFactory.create(), null);
 
 			assertThat(rsp).isEmpty();
 		}
@@ -138,7 +138,7 @@ class KeycloakUserPreconditionServiceTest {
 	@Nested
 	class TestGroupsExists {
 
-		private static final OzgKeycloakUser user = OzgKeycloakUserTestFactory.create();
+		private static final OzgCloudKeycloakUser user = OzgCloudKeycloakUserTestFactory.create();
 
 		@BeforeEach
 		void init() {
@@ -148,7 +148,7 @@ class KeycloakUserPreconditionServiceTest {
 
 		@Test
 		void shouldReturnMissingGroup() {
-			when(keycloakGenericRemoteService.groupExists(KeycloakUserSpecUserTestFactory.GROUP_NAME_1, OzgKeycloakUserTestFactory.METADATA_NAMESPACE)).thenReturn(false);
+			when(keycloakGenericRemoteService.groupExists(KeycloakUserSpecUserTestFactory.GROUP_NAME_1, OzgCloudKeycloakUserTestFactory.METADATA_NAMESPACE)).thenReturn(false);
 
 			var rsp = service.getPreconditionErrors(user);
 
@@ -157,8 +157,8 @@ class KeycloakUserPreconditionServiceTest {
 
 		@Test
 		void shouldReturnGroupExists() {
-			when(keycloakGenericRemoteService.groupExists(KeycloakUserSpecUserTestFactory.GROUP_NAME_1, OzgKeycloakUserTestFactory.METADATA_NAMESPACE)).thenReturn(true);
-			when(keycloakGenericRemoteService.groupExists(KeycloakUserSpecUserTestFactory.GROUP_NAME_2, OzgKeycloakUserTestFactory.METADATA_NAMESPACE)).thenReturn(true);
+			when(keycloakGenericRemoteService.groupExists(KeycloakUserSpecUserTestFactory.GROUP_NAME_1, OzgCloudKeycloakUserTestFactory.METADATA_NAMESPACE)).thenReturn(true);
+			when(keycloakGenericRemoteService.groupExists(KeycloakUserSpecUserTestFactory.GROUP_NAME_2, OzgCloudKeycloakUserTestFactory.METADATA_NAMESPACE)).thenReturn(true);
 
 			var rsp = service.getPreconditionErrors(user);
 
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserReconcilerTest.java b/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserReconcilerTest.java
index 2f25cdeb8f0513f445c2111153f9f644c1de65ad..e22f7b0622e507c963a4770a126d856972a69a5a 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserReconcilerTest.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserReconcilerTest.java
@@ -37,8 +37,8 @@ import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.Spy;
 
-import de.ozgcloud.operator.keycloak.OzgCustomResourceStatus;
-import de.ozgcloud.operator.keycloak.user.OzgKeycloakUserSpec.KeycloakUserSpecUser;
+import de.ozgcloud.operator.keycloak.OzgCloudCustomResourceStatus;
+import de.ozgcloud.operator.keycloak.user.OzgCloudKeycloakUserSpec.KeycloakUserSpecUser;
 import io.javaoperatorsdk.operator.api.reconciler.DeleteControl;
 
 class KeycloakUserReconcilerTest {
@@ -63,20 +63,20 @@ class KeycloakUserReconcilerTest {
 
 		@Test
 		void shouldCallServiceAddUser() {
-			OzgKeycloakUser user = OzgKeycloakUserTestFactory.create();
+			OzgCloudKeycloakUser user = OzgCloudKeycloakUserTestFactory.create();
 
 			reconciler.reconcile(user, null);
 
-			verify(service).createOrUpdateUser(user.getSpec(), OzgKeycloakUserTestFactory.METADATA_NAMESPACE);
+			verify(service).createOrUpdateUser(user.getSpec(), OzgCloudKeycloakUserTestFactory.METADATA_NAMESPACE);
 		}
 
 		@Test
 		void shouldUpdateStatus() {
-			OzgKeycloakUser user = OzgKeycloakUserTestFactory.create();
+			OzgCloudKeycloakUser user = OzgCloudKeycloakUserTestFactory.create();
 
 			reconciler.reconcile(user, null);
 
-			assertThat(user.getStatus().getStatus()).isEqualTo(OzgCustomResourceStatus.OK);
+			assertThat(user.getStatus().getStatus()).isEqualTo(OzgCloudCustomResourceStatus.OK);
 		}
 
 		@Nested
@@ -87,7 +87,7 @@ class KeycloakUserReconcilerTest {
 			@Test
 			void shouldSetPreconcitionErrorMessage() {
 				when(preconditionService.getPreconditionErrors(any())).thenReturn(Optional.of(ERROR_MESSAGE));
-				OzgKeycloakUser user = OzgKeycloakUserTestFactory.create();
+				OzgCloudKeycloakUser user = OzgCloudKeycloakUserTestFactory.create();
 
 				reconciler.reconcile(user, null);
 
@@ -105,15 +105,15 @@ class KeycloakUserReconcilerTest {
 		class TestWithKeepAfterDelete {
 
 			private final KeycloakUserSpecUser keycloakUser = KeycloakUserSpecUserTestFactory.createBuiler().build();
-			private final OzgKeycloakUserSpec userSpec = OzgKeycloakUserSpecTestFactory.createBuilder().keepAfterDelete(true)
+			private final OzgCloudKeycloakUserSpec userSpec = OzgCloudKeycloakUserSpecTestFactory.createBuilder().keepAfterDelete(true)
 					.keycloakUser(keycloakUser).build();
-			private final OzgKeycloakUser user = OzgKeycloakUserTestFactory.create(userSpec);
+			private final OzgCloudKeycloakUser user = OzgCloudKeycloakUserTestFactory.create(userSpec);
 
 			@Test
 			void shouldNotCallService() {
 				reconciler.cleanup(user, null);
 
-				verify(service, never()).deleteUser(userSpec, OzgKeycloakUserTestFactory.METADATA_NAMESPACE);
+				verify(service, never()).deleteUser(userSpec, OzgCloudKeycloakUserTestFactory.METADATA_NAMESPACE);
 			}
 
 			@Test
@@ -126,11 +126,11 @@ class KeycloakUserReconcilerTest {
 
 		@Test
 		void shouldCallServiceDelete() {
-			var user = OzgKeycloakUserTestFactory.create();
+			var user = OzgCloudKeycloakUserTestFactory.create();
 
 			reconciler.cleanup(user);
 
-			verify(service).deleteUser(user.getSpec(), OzgKeycloakUserTestFactory.METADATA_NAMESPACE);
+			verify(service).deleteUser(user.getSpec(), OzgCloudKeycloakUserTestFactory.METADATA_NAMESPACE);
 		}
 	}
 }
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserServiceTest.java b/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserServiceTest.java
index faebcd192bf975cb39dc1caf737c9f5b5b5a73c7..827bbb9eff01c698e1b5f9d557c12bedce12f11f 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserServiceTest.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserServiceTest.java
@@ -70,9 +70,9 @@ class KeycloakUserServiceTest {
 		@Mock
 		private Resource<Secret> resource;
 		@Captor
-		private ArgumentCaptor<OzgKeycloakUserSpec> ozgKeycloakUserSpecCaptor;
+		private ArgumentCaptor<OzgCloudKeycloakUserSpec> ozgCloudKeycloakUserSpecCaptor;
 
-		private final OzgKeycloakUserSpec userSpec = OzgKeycloakUserSpecTestFactory.create();
+		private final OzgCloudKeycloakUserSpec userSpec = OzgCloudKeycloakUserSpecTestFactory.create();
 
 		@DisplayName("user has no password")
 		@Nested
@@ -92,14 +92,14 @@ class KeycloakUserServiceTest {
 
 			@Test
 			void shouldUpdateUserPassword() {
-				var userWithoutPassword = OzgKeycloakUserSpecTestFactory.createBuilder()
+				var userWithoutPassword = OzgCloudKeycloakUserSpecTestFactory.createBuilder()
 						.keycloakUser(KeycloakUserSpecUserTestFactory.createBuiler().password(StringUtils.EMPTY).build()).build();
 				when(userSecretService.getPasswordFromSecret(any())).thenReturn(KeycloakUserSpecUserTestFactory.PASSWORD);
 
 				service.createOrUpdateUser(userWithoutPassword, TEST_NAMESPACE);
 
-				verify(userMapper).map(ozgKeycloakUserSpecCaptor.capture());
-				assertThat(ozgKeycloakUserSpecCaptor.getValue().getKeycloakUser().getPassword()).isEqualTo(KeycloakUserSpecUserTestFactory.PASSWORD);
+				verify(userMapper).map(ozgCloudKeycloakUserSpecCaptor.capture());
+				assertThat(ozgCloudKeycloakUserSpecCaptor.getValue().getKeycloakUser().getPassword()).isEqualTo(KeycloakUserSpecUserTestFactory.PASSWORD);
 			}
 		}
 
@@ -149,7 +149,7 @@ class KeycloakUserServiceTest {
 					.thenReturn(Optional.empty());
 			when(userMapper.map(any())).thenReturn(Mockito.mock(UserRepresentation.class));
 
-			service.createOrUpdateUser(OzgKeycloakUserSpecTestFactory.create(), TEST_NAMESPACE);
+			service.createOrUpdateUser(OzgCloudKeycloakUserSpecTestFactory.create(), TEST_NAMESPACE);
 
 			verify(remoteService).createUser(any(UserRepresentation.class), eq(TEST_NAMESPACE));
 		}
@@ -161,7 +161,7 @@ class KeycloakUserServiceTest {
 					.thenReturn(Optional.of(userRepresentation));
 			when(userMapper.update(eq(userRepresentation), any())).thenReturn(userRepresentation);
 
-			service.createOrUpdateUser(OzgKeycloakUserSpecTestFactory.create(), TEST_NAMESPACE);
+			service.createOrUpdateUser(OzgCloudKeycloakUserSpecTestFactory.create(), TEST_NAMESPACE);
 
 			verify(remoteService).updateUser(userRepresentation, TEST_NAMESPACE);
 		}
@@ -173,7 +173,7 @@ class KeycloakUserServiceTest {
 
 		@Test
 		void testUserHasNoPasswordTrue() {
-			OzgKeycloakUserSpec user = OzgKeycloakUserSpecTestFactory.create();
+			OzgCloudKeycloakUserSpec user = OzgCloudKeycloakUserSpecTestFactory.create();
 
 			boolean userHasNoPassword = service.userHasNoPassword(user, TEST_NAMESPACE);
 
@@ -182,15 +182,15 @@ class KeycloakUserServiceTest {
 
 		@Test
 		void testUserHasNoPasswordFalse() {
-			OzgKeycloakUserSpec user = createUserWithoutPassword();
+			OzgCloudKeycloakUserSpec user = createUserWithoutPassword();
 
 			boolean userHasNoPassword = service.userHasNoPassword(user, TEST_NAMESPACE);
 
 			assertThat(userHasNoPassword).isTrue();
 		}
 
-		private OzgKeycloakUserSpec createUserWithoutPassword() {
-			return OzgKeycloakUserSpecTestFactory.createBuilder()
+		private OzgCloudKeycloakUserSpec createUserWithoutPassword() {
+			return OzgCloudKeycloakUserSpecTestFactory.createBuilder()
 					.keycloakUser(KeycloakUserSpecUserTestFactory.createBuiler()
 							.password(null).build())
 					.build();
@@ -203,7 +203,7 @@ class KeycloakUserServiceTest {
 		@Test
 		void shouldCallUserMapper() {
 
-			var testUser = OzgKeycloakUserSpecTestFactory.create();
+			var testUser = OzgCloudKeycloakUserSpecTestFactory.create();
 
 			service.deleteUser(testUser, TEST_NAMESPACE);
 
@@ -216,7 +216,7 @@ class KeycloakUserServiceTest {
 			var userRepresentation = UserRepresentationTestFactory.create();
 			when(userMapper.map(any())).thenReturn(userRepresentation);
 
-			service.deleteUser(OzgKeycloakUserSpecTestFactory.create(), TEST_NAMESPACE);
+			service.deleteUser(OzgCloudKeycloakUserSpecTestFactory.create(), TEST_NAMESPACE);
 
 			verify(remoteService).getUserByName(userRepresentation.getUsername(), TEST_NAMESPACE);
 		}
@@ -229,7 +229,7 @@ class KeycloakUserServiceTest {
 			when(remoteService.getUserByName(UserRepresentationTestFactory.USERNAME, TEST_NAMESPACE)).thenReturn(Optional.of(userRepresentation));
 			userRepresentation.setId(TEST_USERID);
 
-			service.deleteUser(OzgKeycloakUserSpecTestFactory.create(), TEST_NAMESPACE);
+			service.deleteUser(OzgCloudKeycloakUserSpecTestFactory.create(), TEST_NAMESPACE);
 
 			verify(remoteService).deleteUser(TEST_USERID, TEST_NAMESPACE);
 		}
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserSpecUserTestFactory.java b/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserSpecUserTestFactory.java
index c3acd6406f9b33db14544ea10ee33542fef3c059..7029584c37f569caf73355b12d1698c930ca0e2d 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserSpecUserTestFactory.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/user/KeycloakUserSpecUserTestFactory.java
@@ -26,9 +26,9 @@ package de.ozgcloud.operator.keycloak.user;
 import java.util.List;
 import java.util.UUID;
 
-import de.ozgcloud.operator.keycloak.user.OzgKeycloakUserSpec.KeycloakUserSpecClientRole;
-import de.ozgcloud.operator.keycloak.user.OzgKeycloakUserSpec.KeycloakUserSpecUser;
-import de.ozgcloud.operator.keycloak.user.OzgKeycloakUserSpec.KeycloakUserSpecUserGroup;
+import de.ozgcloud.operator.keycloak.user.OzgCloudKeycloakUserSpec.KeycloakUserSpecClientRole;
+import de.ozgcloud.operator.keycloak.user.OzgCloudKeycloakUserSpec.KeycloakUserSpecUser;
+import de.ozgcloud.operator.keycloak.user.OzgCloudKeycloakUserSpec.KeycloakUserSpecUserGroup;
 
 class KeycloakUserSpecUserTestFactory {
 
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/user/OzgKeycloakUserSpecTestFactory.java b/src/test/java/de/ozgcloud/operator/keycloak/user/OzgCloudKeycloakUserSpecTestFactory.java
similarity index 78%
rename from src/test/java/de/ozgcloud/operator/keycloak/user/OzgKeycloakUserSpecTestFactory.java
rename to src/test/java/de/ozgcloud/operator/keycloak/user/OzgCloudKeycloakUserSpecTestFactory.java
index 853f7dbcf39d4e2a93777ccc4cd3157aa37feacb..a76206d878e3c9a3e240b47f037990787dca16de 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/user/OzgKeycloakUserSpecTestFactory.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/user/OzgCloudKeycloakUserSpecTestFactory.java
@@ -23,16 +23,16 @@
  */
 package de.ozgcloud.operator.keycloak.user;
 
-import de.ozgcloud.operator.keycloak.user.OzgKeycloakUserSpec.OzgKeycloakUserSpecBuilder;
+import de.ozgcloud.operator.keycloak.user.OzgCloudKeycloakUserSpec.OzgCloudKeycloakUserSpecBuilder;
 
-public class OzgKeycloakUserSpecTestFactory {
+public class OzgCloudKeycloakUserSpecTestFactory {
 
-	public static OzgKeycloakUserSpec create() {
+	public static OzgCloudKeycloakUserSpec create() {
 		return createBuilder().build();
 	}
 
-	public static OzgKeycloakUserSpecBuilder createBuilder() {
-		return OzgKeycloakUserSpec.builder()
+	public static OzgCloudKeycloakUserSpecBuilder createBuilder() {
+		return OzgCloudKeycloakUserSpec.builder()
 				.keycloakUser(KeycloakUserSpecUserTestFactory.create());
 	}
 }
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/user/OzgKeycloakUserStatusTestFactory.java b/src/test/java/de/ozgcloud/operator/keycloak/user/OzgCloudKeycloakUserStatusTestFactory.java
similarity index 76%
rename from src/test/java/de/ozgcloud/operator/keycloak/user/OzgKeycloakUserStatusTestFactory.java
rename to src/test/java/de/ozgcloud/operator/keycloak/user/OzgCloudKeycloakUserStatusTestFactory.java
index 78d56c72688eadf65cc8e34dede0611dfc21baee..30022f2a8ec51475264f28538d610ec13e489e72 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/user/OzgKeycloakUserStatusTestFactory.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/user/OzgCloudKeycloakUserStatusTestFactory.java
@@ -23,15 +23,15 @@
  */
 package de.ozgcloud.operator.keycloak.user;
 
-import de.ozgcloud.operator.keycloak.user.OzgKeycloakUserStatus.OzgKeycloakUserStatusBuilder;
+import de.ozgcloud.operator.keycloak.user.OzgCloudKeycloakUserStatus.OzgCloudKeycloakUserStatusBuilder;
 
-class OzgKeycloakUserStatusTestFactory {
+class OzgCloudKeycloakUserStatusTestFactory {
 
-	public static OzgKeycloakUserStatus create() {
+	public static OzgCloudKeycloakUserStatus create() {
 		return createBuiler().build();
 	}
 
-	private static OzgKeycloakUserStatusBuilder createBuiler() {
-		return OzgKeycloakUserStatus.builder();
+	private static OzgCloudKeycloakUserStatusBuilder createBuiler() {
+		return OzgCloudKeycloakUserStatus.builder();
 	}
 }
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/user/OzgKeycloakUserTestFactory.java b/src/test/java/de/ozgcloud/operator/keycloak/user/OzgCloudKeycloakUserTestFactory.java
similarity index 73%
rename from src/test/java/de/ozgcloud/operator/keycloak/user/OzgKeycloakUserTestFactory.java
rename to src/test/java/de/ozgcloud/operator/keycloak/user/OzgCloudKeycloakUserTestFactory.java
index 79677c8c0797c77b3d7460a19db4a672c623a50c..02a3df0e46fe19ede008f0958ad8288e658d81fd 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/user/OzgKeycloakUserTestFactory.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/user/OzgCloudKeycloakUserTestFactory.java
@@ -23,22 +23,22 @@
  */
 package de.ozgcloud.operator.keycloak.user;
 
-class OzgKeycloakUserTestFactory {
+class OzgCloudKeycloakUserTestFactory {
 
 	public static final String METADATA_NAMESPACE = "TestNamespace";
 
-	public static OzgKeycloakUser create() {
-		return createWithSpec(OzgKeycloakUserSpecTestFactory.create());
+	public static OzgCloudKeycloakUser create() {
+		return createWithSpec(OzgCloudKeycloakUserSpecTestFactory.create());
 	}
 
-	public static OzgKeycloakUser create(OzgKeycloakUserSpec spec) {
+	public static OzgCloudKeycloakUser create(OzgCloudKeycloakUserSpec spec) {
 		return createWithSpec(spec);
 	}
 
-	private static OzgKeycloakUser createWithSpec(OzgKeycloakUserSpec spec) {
-		var keycloakUser = new OzgKeycloakUser();
+	private static OzgCloudKeycloakUser createWithSpec(OzgCloudKeycloakUserSpec spec) {
+		var keycloakUser = new OzgCloudKeycloakUser();
 		keycloakUser.setSpec(spec);
-		keycloakUser.setStatus(OzgKeycloakUserStatusTestFactory.create());
+		keycloakUser.setStatus(OzgCloudKeycloakUserStatusTestFactory.create());
 		keycloakUser.getMetadata().setNamespace(METADATA_NAMESPACE);
 
 		return keycloakUser;
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/user/UserSecretBuilderTest.java b/src/test/java/de/ozgcloud/operator/keycloak/user/UserSecretBuilderTest.java
index 9d92dd981f57389def7895885275dcf0b43c1bdd..7cfbbf8e13b7d2e1d89104616c6aa28a6550e372 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/user/UserSecretBuilderTest.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/user/UserSecretBuilderTest.java
@@ -9,7 +9,7 @@ import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.mockito.Spy;
 
-import de.ozgcloud.operator.keycloak.user.OzgKeycloakUserSpec.KeycloakUserSpecUser;
+import de.ozgcloud.operator.keycloak.user.OzgCloudKeycloakUserSpec.KeycloakUserSpecUser;
 
 public class UserSecretBuilderTest {
 
diff --git a/src/test/java/de/ozgcloud/operator/keycloak/user/UserSecretServiceTest.java b/src/test/java/de/ozgcloud/operator/keycloak/user/UserSecretServiceTest.java
index 4d93da968265bd54789920e8df48f8319598282c..8e2d864d0661cb4baac1ed1e3e1fbda2660211c7 100644
--- a/src/test/java/de/ozgcloud/operator/keycloak/user/UserSecretServiceTest.java
+++ b/src/test/java/de/ozgcloud/operator/keycloak/user/UserSecretServiceTest.java
@@ -36,7 +36,7 @@ class UserSecretServiceTest {
 	@Nested
 	class TestCreateSecret {
 
-		private final OzgKeycloakUserSpec userSpec = OzgKeycloakUserSpecTestFactory.create();
+		private final OzgCloudKeycloakUserSpec userSpec = OzgCloudKeycloakUserSpecTestFactory.create();
 
 		@Mock
 		private Resource<Secret> secretResource;
@@ -113,7 +113,7 @@ class UserSecretServiceTest {
 	@Nested
 	class TestGetUserSecret {
 
-		private final OzgKeycloakUserSpec userSpec = OzgKeycloakUserSpecTestFactory.create();
+		private final OzgCloudKeycloakUserSpec userSpec = OzgCloudKeycloakUserSpecTestFactory.create();
 
 		private final static String CONVERTED_NAME = "SecretConformName";
 
@@ -148,14 +148,14 @@ class UserSecretServiceTest {
 
 		@BeforeEach
 		void init() {
-			doReturn(secretResource).when(userSecretService).getUserSecret(any(OzgKeycloakUserSpec.class), eq(NAMESPACE));
+			doReturn(secretResource).when(userSecretService).getUserSecret(any(OzgCloudKeycloakUserSpec.class), eq(NAMESPACE));
 		}
 
 		@Test
 		void shouldReturnExistingSecret() {
 			when(secretResource.get()).thenReturn(secret);
 
-			Secret secretResponse = userSecretService.getOrCreateClusterSecret(OzgKeycloakUserSpecTestFactory.create(), NAMESPACE);
+			Secret secretResponse = userSecretService.getOrCreateClusterSecret(OzgCloudKeycloakUserSpecTestFactory.create(), NAMESPACE);
 
 			assertThat(secretResponse).isSameAs(secret);
 		}
@@ -163,9 +163,9 @@ class UserSecretServiceTest {
 		@Test
 		void shouldReturnNewSecretIfNotExisting() {
 			when(secretResource.get()).thenReturn(null);
-			doReturn(secret).when(userSecretService).create(any(OzgKeycloakUserSpec.class), eq(NAMESPACE));
+			doReturn(secret).when(userSecretService).create(any(OzgCloudKeycloakUserSpec.class), eq(NAMESPACE));
 
-			Secret secretResponse = userSecretService.getOrCreateClusterSecret(OzgKeycloakUserSpecTestFactory.create(), NAMESPACE);
+			Secret secretResponse = userSecretService.getOrCreateClusterSecret(OzgCloudKeycloakUserSpecTestFactory.create(), NAMESPACE);
 
 			assertThat(secretResponse).isSameAs(secret);
 		}