diff --git a/ozgcloud-elastic-operator/pom.xml b/ozgcloud-elasticsearch-operator/pom.xml
similarity index 100%
rename from ozgcloud-elastic-operator/pom.xml
rename to ozgcloud-elasticsearch-operator/pom.xml
diff --git a/ozgcloud-elastic-operator/run_helm_test.sh b/ozgcloud-elasticsearch-operator/run_helm_test.sh
similarity index 100%
rename from ozgcloud-elastic-operator/run_helm_test.sh
rename to ozgcloud-elasticsearch-operator/run_helm_test.sh
diff --git a/ozgcloud-elastic-operator/src/main/helm/Chart.yaml b/ozgcloud-elasticsearch-operator/src/main/helm/Chart.yaml
similarity index 100%
rename from ozgcloud-elastic-operator/src/main/helm/Chart.yaml
rename to ozgcloud-elasticsearch-operator/src/main/helm/Chart.yaml
diff --git a/ozgcloud-elastic-operator/src/main/helm/templates/crd/operator.ozgcloud.de_OzgCloudElasticsearch.yaml b/ozgcloud-elasticsearch-operator/src/main/helm/templates/crd/operator.ozgcloud.de_OzgCloudElasticsearch.yaml
similarity index 100%
rename from ozgcloud-elastic-operator/src/main/helm/templates/crd/operator.ozgcloud.de_OzgCloudElasticsearch.yaml
rename to ozgcloud-elasticsearch-operator/src/main/helm/templates/crd/operator.ozgcloud.de_OzgCloudElasticsearch.yaml
diff --git a/ozgcloud-elastic-operator/src/main/helm/templates/rbac/elasticsearch_edit_role.yaml b/ozgcloud-elasticsearch-operator/src/main/helm/templates/rbac/elasticsearch_edit_role.yaml
similarity index 100%
rename from ozgcloud-elastic-operator/src/main/helm/templates/rbac/elasticsearch_edit_role.yaml
rename to ozgcloud-elasticsearch-operator/src/main/helm/templates/rbac/elasticsearch_edit_role.yaml
diff --git a/ozgcloud-elastic-operator/src/main/helm/templates/rbac/elasticsearch_view_role.yaml b/ozgcloud-elasticsearch-operator/src/main/helm/templates/rbac/elasticsearch_view_role.yaml
similarity index 100%
rename from ozgcloud-elastic-operator/src/main/helm/templates/rbac/elasticsearch_view_role.yaml
rename to ozgcloud-elasticsearch-operator/src/main/helm/templates/rbac/elasticsearch_view_role.yaml
diff --git a/ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/CustomResourceStatus.java b/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/CustomResourceStatus.java
similarity index 100%
rename from ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/CustomResourceStatus.java
rename to ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/CustomResourceStatus.java
diff --git a/ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/ElasticsearchCustomResourceStatus.java b/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/ElasticsearchCustomResourceStatus.java
similarity index 100%
rename from ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/ElasticsearchCustomResourceStatus.java
rename to ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/ElasticsearchCustomResourceStatus.java
diff --git a/ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/ElasticsearchOperatorApplication.java b/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/ElasticsearchOperatorApplication.java
similarity index 100%
rename from ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/ElasticsearchOperatorApplication.java
rename to ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/ElasticsearchOperatorApplication.java
diff --git a/ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/OperatorConfig.java b/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/OperatorConfig.java
similarity index 100%
rename from ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/OperatorConfig.java
rename to ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/OperatorConfig.java
diff --git a/ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/common/elasticsearch/OzgCloudElasticsearchClient.java b/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/common/elasticsearch/OzgCloudElasticsearchClient.java
similarity index 100%
rename from ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/common/elasticsearch/OzgCloudElasticsearchClient.java
rename to ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/common/elasticsearch/OzgCloudElasticsearchClient.java
diff --git a/ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/common/elasticsearch/OzgCloudElasticsearchProperties.java b/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/common/elasticsearch/OzgCloudElasticsearchProperties.java
similarity index 100%
rename from ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/common/elasticsearch/OzgCloudElasticsearchProperties.java
rename to ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/common/elasticsearch/OzgCloudElasticsearchProperties.java
diff --git a/ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/common/elasticsearch/OzgCloudElasticsearchRemoteService.java b/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/common/elasticsearch/OzgCloudElasticsearchRemoteService.java
similarity index 100%
rename from ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/common/elasticsearch/OzgCloudElasticsearchRemoteService.java
rename to ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/common/elasticsearch/OzgCloudElasticsearchRemoteService.java
diff --git a/ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/common/elasticsearch/OzgCloudElasticsearchService.java b/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/common/elasticsearch/OzgCloudElasticsearchService.java
similarity index 100%
rename from ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/common/elasticsearch/OzgCloudElasticsearchService.java
rename to ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/common/elasticsearch/OzgCloudElasticsearchService.java
diff --git a/ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/common/kubernetes/KubernetesService.java b/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/common/kubernetes/KubernetesService.java
similarity index 100%
rename from ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/common/kubernetes/KubernetesService.java
rename to ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/common/kubernetes/KubernetesService.java
diff --git a/ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/user/ElasticsearchCustomResource.java b/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/user/ElasticsearchCustomResource.java
similarity index 100%
rename from ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/user/ElasticsearchCustomResource.java
rename to ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/user/ElasticsearchCustomResource.java
diff --git a/ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/user/ElasticsearchReconciler.java b/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/user/ElasticsearchReconciler.java
similarity index 100%
rename from ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/user/ElasticsearchReconciler.java
rename to ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/user/ElasticsearchReconciler.java
diff --git a/ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/user/ElasticsearchSecretHelper.java b/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/user/ElasticsearchSecretHelper.java
similarity index 100%
rename from ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/user/ElasticsearchSecretHelper.java
rename to ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/user/ElasticsearchSecretHelper.java
diff --git a/ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/user/ElasticsearchService.java b/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/user/ElasticsearchService.java
similarity index 100%
rename from ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/user/ElasticsearchService.java
rename to ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/user/ElasticsearchService.java
diff --git a/ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/user/ElasticsearchSpec.java b/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/user/ElasticsearchSpec.java
similarity index 100%
rename from ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/user/ElasticsearchSpec.java
rename to ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/user/ElasticsearchSpec.java
diff --git a/ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/user/ElasticsearchUpdateControlBuilder.java b/ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/user/ElasticsearchUpdateControlBuilder.java
similarity index 100%
rename from ozgcloud-elastic-operator/src/main/java/de/ozgcloud/operator/user/ElasticsearchUpdateControlBuilder.java
rename to ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/user/ElasticsearchUpdateControlBuilder.java
diff --git a/ozgcloud-elastic-operator/src/main/resources/application.yml b/ozgcloud-elasticsearch-operator/src/main/resources/application.yml
similarity index 100%
rename from ozgcloud-elastic-operator/src/main/resources/application.yml
rename to ozgcloud-elasticsearch-operator/src/main/resources/application.yml
diff --git a/ozgcloud-elastic-operator/src/test/helm/crd/operator.ozgcloud.de_OzgCloudElasticsearch_test.yaml b/ozgcloud-elasticsearch-operator/src/test/helm/crd/operator.ozgcloud.de_OzgCloudElasticsearch_test.yaml
similarity index 100%
rename from ozgcloud-elastic-operator/src/test/helm/crd/operator.ozgcloud.de_OzgCloudElasticsearch_test.yaml
rename to ozgcloud-elasticsearch-operator/src/test/helm/crd/operator.ozgcloud.de_OzgCloudElasticsearch_test.yaml
diff --git a/ozgcloud-elastic-operator/src/test/helm/crd/operator.ozgcloud.de_OzgCloudElasticsearch_versions_v1_test.yaml b/ozgcloud-elasticsearch-operator/src/test/helm/crd/operator.ozgcloud.de_OzgCloudElasticsearch_versions_v1_test.yaml
similarity index 100%
rename from ozgcloud-elastic-operator/src/test/helm/crd/operator.ozgcloud.de_OzgCloudElasticsearch_versions_v1_test.yaml
rename to ozgcloud-elasticsearch-operator/src/test/helm/crd/operator.ozgcloud.de_OzgCloudElasticsearch_versions_v1_test.yaml
diff --git a/ozgcloud-elastic-operator/src/test/helm/linter_values.yaml b/ozgcloud-elasticsearch-operator/src/test/helm/linter_values.yaml
similarity index 100%
rename from ozgcloud-elastic-operator/src/test/helm/linter_values.yaml
rename to ozgcloud-elasticsearch-operator/src/test/helm/linter_values.yaml
diff --git a/ozgcloud-elastic-operator/src/test/helm/rbac/elasticsearch_edit_role_test.yaml b/ozgcloud-elasticsearch-operator/src/test/helm/rbac/elasticsearch_edit_role_test.yaml
similarity index 100%
rename from ozgcloud-elastic-operator/src/test/helm/rbac/elasticsearch_edit_role_test.yaml
rename to ozgcloud-elasticsearch-operator/src/test/helm/rbac/elasticsearch_edit_role_test.yaml
diff --git a/ozgcloud-elastic-operator/src/test/helm/rbac/elasticsearch_view_role_test.yaml b/ozgcloud-elasticsearch-operator/src/test/helm/rbac/elasticsearch_view_role_test.yaml
similarity index 100%
rename from ozgcloud-elastic-operator/src/test/helm/rbac/elasticsearch_view_role_test.yaml
rename to ozgcloud-elasticsearch-operator/src/test/helm/rbac/elasticsearch_view_role_test.yaml
diff --git a/ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/ElasticOperatorApplicationTest.java b/ozgcloud-elasticsearch-operator/src/test/java/de/ozgcloud/operator/ElasticOperatorApplicationTest.java
similarity index 100%
rename from ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/ElasticOperatorApplicationTest.java
rename to ozgcloud-elasticsearch-operator/src/test/java/de/ozgcloud/operator/ElasticOperatorApplicationTest.java
diff --git a/ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/common/elasticsearch/OzgCloudElasticsearchRemoteServiceTest.java b/ozgcloud-elasticsearch-operator/src/test/java/de/ozgcloud/operator/common/elasticsearch/OzgCloudElasticsearchRemoteServiceTest.java
similarity index 100%
rename from ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/common/elasticsearch/OzgCloudElasticsearchRemoteServiceTest.java
rename to ozgcloud-elasticsearch-operator/src/test/java/de/ozgcloud/operator/common/elasticsearch/OzgCloudElasticsearchRemoteServiceTest.java
diff --git a/ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/common/elasticsearch/OzgCloudElasticsearchServiceTest.java b/ozgcloud-elasticsearch-operator/src/test/java/de/ozgcloud/operator/common/elasticsearch/OzgCloudElasticsearchServiceTest.java
similarity index 100%
rename from ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/common/elasticsearch/OzgCloudElasticsearchServiceTest.java
rename to ozgcloud-elasticsearch-operator/src/test/java/de/ozgcloud/operator/common/elasticsearch/OzgCloudElasticsearchServiceTest.java
diff --git a/ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/common/elasticsearch/OzgCloudElasticsearchTest2.java b/ozgcloud-elasticsearch-operator/src/test/java/de/ozgcloud/operator/common/elasticsearch/OzgCloudElasticsearchTest2.java
similarity index 100%
rename from ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/common/elasticsearch/OzgCloudElasticsearchTest2.java
rename to ozgcloud-elasticsearch-operator/src/test/java/de/ozgcloud/operator/common/elasticsearch/OzgCloudElasticsearchTest2.java
diff --git a/ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/common/kubernetes/KubernetesServiceITCase.java b/ozgcloud-elasticsearch-operator/src/test/java/de/ozgcloud/operator/common/kubernetes/KubernetesServiceITCase.java
similarity index 100%
rename from ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/common/kubernetes/KubernetesServiceITCase.java
rename to ozgcloud-elasticsearch-operator/src/test/java/de/ozgcloud/operator/common/kubernetes/KubernetesServiceITCase.java
diff --git a/ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/common/kubernetes/KubernetesServiceTest.java b/ozgcloud-elasticsearch-operator/src/test/java/de/ozgcloud/operator/common/kubernetes/KubernetesServiceTest.java
similarity index 100%
rename from ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/common/kubernetes/KubernetesServiceTest.java
rename to ozgcloud-elasticsearch-operator/src/test/java/de/ozgcloud/operator/common/kubernetes/KubernetesServiceTest.java
diff --git a/ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/common/kubernetes/NamespaceTestFactory.java b/ozgcloud-elasticsearch-operator/src/test/java/de/ozgcloud/operator/common/kubernetes/NamespaceTestFactory.java
similarity index 100%
rename from ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/common/kubernetes/NamespaceTestFactory.java
rename to ozgcloud-elasticsearch-operator/src/test/java/de/ozgcloud/operator/common/kubernetes/NamespaceTestFactory.java
diff --git a/ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/common/kubernetes/SecretTestFactory.java b/ozgcloud-elasticsearch-operator/src/test/java/de/ozgcloud/operator/common/kubernetes/SecretTestFactory.java
similarity index 100%
rename from ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/common/kubernetes/SecretTestFactory.java
rename to ozgcloud-elasticsearch-operator/src/test/java/de/ozgcloud/operator/common/kubernetes/SecretTestFactory.java
diff --git a/ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/user/ElasticsearchCustomResourceStatusTestFactory.java b/ozgcloud-elasticsearch-operator/src/test/java/de/ozgcloud/operator/user/ElasticsearchCustomResourceStatusTestFactory.java
similarity index 100%
rename from ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/user/ElasticsearchCustomResourceStatusTestFactory.java
rename to ozgcloud-elasticsearch-operator/src/test/java/de/ozgcloud/operator/user/ElasticsearchCustomResourceStatusTestFactory.java
diff --git a/ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/user/ElasticsearchCustomResourceTestFactory.java b/ozgcloud-elasticsearch-operator/src/test/java/de/ozgcloud/operator/user/ElasticsearchCustomResourceTestFactory.java
similarity index 100%
rename from ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/user/ElasticsearchCustomResourceTestFactory.java
rename to ozgcloud-elasticsearch-operator/src/test/java/de/ozgcloud/operator/user/ElasticsearchCustomResourceTestFactory.java
diff --git a/ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/user/ElasticsearchReconcilerITCase.java b/ozgcloud-elasticsearch-operator/src/test/java/de/ozgcloud/operator/user/ElasticsearchReconcilerITCase.java
similarity index 100%
rename from ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/user/ElasticsearchReconcilerITCase.java
rename to ozgcloud-elasticsearch-operator/src/test/java/de/ozgcloud/operator/user/ElasticsearchReconcilerITCase.java
diff --git a/ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/user/ElasticsearchReconcilerTest.java b/ozgcloud-elasticsearch-operator/src/test/java/de/ozgcloud/operator/user/ElasticsearchReconcilerTest.java
similarity index 100%
rename from ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/user/ElasticsearchReconcilerTest.java
rename to ozgcloud-elasticsearch-operator/src/test/java/de/ozgcloud/operator/user/ElasticsearchReconcilerTest.java
diff --git a/ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/user/ElasticsearchSecretBuilderTest.java b/ozgcloud-elasticsearch-operator/src/test/java/de/ozgcloud/operator/user/ElasticsearchSecretBuilderTest.java
similarity index 100%
rename from ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/user/ElasticsearchSecretBuilderTest.java
rename to ozgcloud-elasticsearch-operator/src/test/java/de/ozgcloud/operator/user/ElasticsearchSecretBuilderTest.java
diff --git a/ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/user/ElasticsearchServiceTest.java b/ozgcloud-elasticsearch-operator/src/test/java/de/ozgcloud/operator/user/ElasticsearchServiceTest.java
similarity index 100%
rename from ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/user/ElasticsearchServiceTest.java
rename to ozgcloud-elasticsearch-operator/src/test/java/de/ozgcloud/operator/user/ElasticsearchServiceTest.java
diff --git a/ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/user/ObjectMetaTestFactory.java b/ozgcloud-elasticsearch-operator/src/test/java/de/ozgcloud/operator/user/ObjectMetaTestFactory.java
similarity index 100%
rename from ozgcloud-elastic-operator/src/test/java/de/ozgcloud/operator/user/ObjectMetaTestFactory.java
rename to ozgcloud-elasticsearch-operator/src/test/java/de/ozgcloud/operator/user/ObjectMetaTestFactory.java
diff --git a/ozgcloud-elastic-operator/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/ozgcloud-elasticsearch-operator/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
similarity index 100%
rename from ozgcloud-elastic-operator/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
rename to ozgcloud-elasticsearch-operator/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
diff --git a/ozgcloud-elastic-operator/src/test/resources/application.yml b/ozgcloud-elasticsearch-operator/src/test/resources/application.yml
similarity index 100%
rename from ozgcloud-elastic-operator/src/test/resources/application.yml
rename to ozgcloud-elasticsearch-operator/src/test/resources/application.yml
diff --git a/ozgcloud-elastic-operator/src/test/resources/junit-platform.properties b/ozgcloud-elasticsearch-operator/src/test/resources/junit-platform.properties
similarity index 100%
rename from ozgcloud-elastic-operator/src/test/resources/junit-platform.properties
rename to ozgcloud-elasticsearch-operator/src/test/resources/junit-platform.properties