diff --git a/theodolite-quarkus/src/main/kotlin/theodolite/execution/TheodoliteOperator.kt b/theodolite-quarkus/src/main/kotlin/theodolite/execution/TheodoliteOperator.kt
index 9109d1246c01b47779b982bf7910f75dfc33470e..acbd34c040b3af3d2c2cf61bd4a9d922162dd9e6 100644
--- a/theodolite-quarkus/src/main/kotlin/theodolite/execution/TheodoliteOperator.kt
+++ b/theodolite-quarkus/src/main/kotlin/theodolite/execution/TheodoliteOperator.kt
@@ -11,7 +11,7 @@ import io.fabric8.kubernetes.internal.KubernetesDeserializer
 private var DEFAULT_NAMESPACE = "default"
 private val logger = KotlinLogging.logger {}
 
-@QuarkusMain(name = "TheodoliteCRDExecutor")
+@QuarkusMain(name = "TheodoliteOperator")
 object TheodoliteCRDExecutor {
     @JvmStatic
     fun main(args: Array<String>) {
@@ -23,29 +23,29 @@ object TheodoliteCRDExecutor {
 
 
         KubernetesDeserializer.registerCustomKind(
-            "demo.k8s.io/v1alpha1",
-            "Benchmarkexecutions",
+            "theodolite.com/v1alpha1",
+            "execution",
             BenchmarkExecution::class.java
         )
 
         KubernetesDeserializer.registerCustomKind(
-            "demo.k8s.io/v1alpha1",
-            "Benchmarktype",
+            "theodolite.com/v1alpha1",
+            "benchmark",
             KubernetesBenchmark::class.java
         )
 
         val ExececutionContext = CustomResourceDefinitionContext.Builder()
             .withVersion("v1alpha1")
             .withScope("Namespaced")
-            .withGroup("demo.k8s.io")
-            .withPlural("benchmarkexecutions")
+            .withGroup("theodolite.com")
+            .withPlural("executions")
             .build()
 
         val TypeContext = CustomResourceDefinitionContext.Builder()
             .withVersion("v1alpha1")
             .withScope("Namespaced")
-            .withGroup("demo.k8s.io")
-            .withPlural("benchmarktypes")
+            .withGroup("theodolite.com")
+            .withPlural("benchmarks")
             .build()
 
         val informerFactory = client.informers()
diff --git a/theodolite-quarkus/src/main/resources/Operator/BenchmarkExecution.yaml b/theodolite-quarkus/src/main/resources/Operator/BenchmarkExecution.yaml
index 6caff74a53059fd888c3a0cc790c6d3de99b9a89..3afb061e37a7c989bde58923f1dc39d4831643b3 100644
--- a/theodolite-quarkus/src/main/resources/Operator/BenchmarkExecution.yaml
+++ b/theodolite-quarkus/src/main/resources/Operator/BenchmarkExecution.yaml
@@ -1,5 +1,5 @@
-apiVersion: demo.k8s.io/v1alpha1
-kind: Benchmarkexecutions
+apiVersion: theodolite.com/v1alpha1
+kind: execution
 metadata:
   name: example-webserver
 name: "Theodolite Test Context"
@@ -24,4 +24,6 @@ execution:
   duration: 60
   repetitions: 1
   restrictions:
-    - "LowerBound"
\ No newline at end of file
+    - "LowerBound"
+configOverrides:
+  -
\ No newline at end of file
diff --git a/theodolite-quarkus/src/main/resources/Operator/BenchmarktypeCrd.yaml b/theodolite-quarkus/src/main/resources/Operator/BenchmarktypeCrd.yaml
index 44e47b28b8a41db2cd377deb4539cd218f520b97..8fb3de1928f051d338a78ee58da074a73ef933c1 100644
--- a/theodolite-quarkus/src/main/resources/Operator/BenchmarktypeCrd.yaml
+++ b/theodolite-quarkus/src/main/resources/Operator/BenchmarktypeCrd.yaml
@@ -1,13 +1,13 @@
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
-  name: benchmark.theodolite
+  name: benchmarks.theodolite.com
 spec:
-  group: theodolite
+  group: theodolite.com
   version: v1alpha1
   names:
-    kind: Benchmarktype
-    plural: benchmarktypes
+    kind: benchmark
+    plural: benchmarks
   scope: Namespaced
   subresources:
     status: {}
\ No newline at end of file
diff --git a/theodolite-quarkus/src/main/resources/Operator/ExecutionCrd.yaml b/theodolite-quarkus/src/main/resources/Operator/ExecutionCrd.yaml
index efe40d7c238886ca53c603f589b560e7b43ea388..0bdb83c6201112a750bad41b81321b7a108a66fa 100644
--- a/theodolite-quarkus/src/main/resources/Operator/ExecutionCrd.yaml
+++ b/theodolite-quarkus/src/main/resources/Operator/ExecutionCrd.yaml
@@ -1,13 +1,13 @@
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
-  name: executions.theodolite
+  name: executions.theodolite.com
 spec:
-  group: theodolite
+  group: theodolite.com
   version: v1alpha1
   names:
-    kind: Benchmarkexecutions
-    plural: benchmarkexecutions
+    kind: execution
+    plural: executions
   scope: Namespaced
   subresources:
     status: {}
\ No newline at end of file
diff --git a/theodolite-quarkus/src/main/resources/Operator/benchmarktype.yaml b/theodolite-quarkus/src/main/resources/Operator/benchmarktype.yaml
index a57aa3a9c6a10019068aea58538531b76d2bb0bf..dde93c95319134ef7d661860e590b182055742c1 100644
--- a/theodolite-quarkus/src/main/resources/Operator/benchmarktype.yaml
+++ b/theodolite-quarkus/src/main/resources/Operator/benchmarktype.yaml
@@ -1,5 +1,5 @@
-apiVersion: demo.k8s.io/v1alpha1
-kind: Benchmarktype
+apiVersion: theodolite.com/v1alpha1
+kind: benchmark
 metadata:
   name: example-webserver
 name: "theodolite ist cool"
diff --git a/theodolite-quarkus/src/main/resources/application.properties b/theodolite-quarkus/src/main/resources/application.properties
index 397f64e02d59e0619db5da05d44f37096450c960..32eef7a25d994df7e67bbb61f550903d83f8594b 100644
--- a/theodolite-quarkus/src/main/resources/application.properties
+++ b/theodolite-quarkus/src/main/resources/application.properties
@@ -1 +1 @@
-quarkus.package.main-class=TheodoliteCRDExecutor
\ No newline at end of file
+quarkus.package.main-class=TheodoliteOperator
\ No newline at end of file