diff --git a/theodolite-quarkus/src/main/resources/yaml/testBenchmarkExecution.yaml b/theodolite-quarkus/src/main/resources/yaml/BenchmarkExecution.yaml
similarity index 80%
rename from theodolite-quarkus/src/main/resources/yaml/testBenchmarkExecution.yaml
rename to theodolite-quarkus/src/main/resources/yaml/BenchmarkExecution.yaml
index b1c9af6e48bb9115989b74dd5739649be6269e4e..270daee1708ca4791c65ff9f4a9e1a1e7e78c4d3 100644
--- a/theodolite-quarkus/src/main/resources/yaml/testBenchmarkExecution.yaml
+++ b/theodolite-quarkus/src/main/resources/yaml/BenchmarkExecution.yaml
@@ -20,23 +20,23 @@ execution:
 configOverrides:
   - patcher:
       type: "NodeSelectorPatcher"
-      resource: "workloadGenerator.yaml"
+      resource: "uc1-load-generator-deployment.yaml"
       variableName: "env"
     value: "prod"
   - patcher:
       type: "NodeSelectorPatcher"
-      resource: "aggregation-deployment.yaml"
+      resource: "uc1-kstreams-deployment.yaml"
       variableName: "env"
     value: "prod"
   - patcher:
       type: "ResourceLimitPatcher"
-      resource: "aggregation-deployment.yaml"
+      resource: "uc1-kstreams-deployment.yaml"
       container: "uc-application"
       variableName: "cpu"
     value: "50m"
   - patcher:
       type: "ResourceLimitPatcher"
-      resource: "aggregation-deployment.yaml"
+      resource: "uc1-kstreams-deployment.yaml"
       container: "uc-application"
       variableName: "memory"
     value: "2Gi"
\ No newline at end of file
diff --git a/theodolite-quarkus/src/main/resources/yaml/testBenchmarkType.yaml b/theodolite-quarkus/src/main/resources/yaml/BenchmarkType.yaml
similarity index 74%
rename from theodolite-quarkus/src/main/resources/yaml/testBenchmarkType.yaml
rename to theodolite-quarkus/src/main/resources/yaml/BenchmarkType.yaml
index c36859c64bbc1cfcabbc973dd65f6142306e56de..4a1671decaf48fa89e43b23621db36a6220d763d 100644
--- a/theodolite-quarkus/src/main/resources/yaml/testBenchmarkType.yaml
+++ b/theodolite-quarkus/src/main/resources/yaml/BenchmarkType.yaml
@@ -1,20 +1,20 @@
 name: "theodolite ist cool"
 appResource:
-  - "aggregation-deployment.yaml"
+  - "uc1-kstreams-deployment.yaml"
   - "aggregation-service.yaml"
   - "jmx-configmap.yaml"
 loadGenResource:
-  - "workloadGenerator.yaml"
+  - "uc1-load-generator-deployment.yaml"
 resourceTypes:
   - typeName: "Instances"
     patchers:
       - type: "ReplicaPatcher"
-        resource: "aggregation-deployment.yaml"
+        resource: "uc1-kstreams-deployment.yaml"
 loadTypes:
   - typeName: "NumSensors"
     patchers:
       - type: "EnvVarPatcher"
-        resource: "workloadGenerator.yaml"
+        resource: "uc1-load-generator-deployment.yaml"
         container: "workload-generator"
         variableName: "NUM_SENSORS"
 kafkaConfig:
diff --git a/theodolite-quarkus/src/main/resources/yaml/aggregation-deployment.yaml b/theodolite-quarkus/src/main/resources/yaml/uc1-kstreams-deployment.yaml
similarity index 100%
rename from theodolite-quarkus/src/main/resources/yaml/aggregation-deployment.yaml
rename to theodolite-quarkus/src/main/resources/yaml/uc1-kstreams-deployment.yaml
diff --git a/theodolite-quarkus/src/main/resources/yaml/workloadGenerator.yaml b/theodolite-quarkus/src/main/resources/yaml/uc1-load-generator-deployment.yaml
similarity index 100%
rename from theodolite-quarkus/src/main/resources/yaml/workloadGenerator.yaml
rename to theodolite-quarkus/src/main/resources/yaml/uc1-load-generator-deployment.yaml
diff --git a/theodolite-quarkus/src/test/kotlin/theodolite/ResourceLimitPatcherTest.kt b/theodolite-quarkus/src/test/kotlin/theodolite/ResourceLimitPatcherTest.kt
index 9b0da36dd9913b929350772297a47fa9289a0559..2170a6a54cf12433b18cc621d78a8608f3f71d63 100644
--- a/theodolite-quarkus/src/test/kotlin/theodolite/ResourceLimitPatcherTest.kt
+++ b/theodolite-quarkus/src/test/kotlin/theodolite/ResourceLimitPatcherTest.kt
@@ -62,25 +62,25 @@ class ResourceLimitPatcherTest {
     }
 
     @Test
-    fun case1() {
+    fun testWithExistingCpuAndMemoryDeclarations() {
         // Case 1: In the given YAML declaration memory and cpu are defined
         applyTest("cpu-memory-deployment.yaml")
     }
 
     @Test
-    fun case2() {
+    fun testOnlyWithExistingCpuDeclarations() {
         // Case 2:  In the given YAML declaration only cpu is defined
         applyTest("cpu-deployment.yaml")
     }
 
     @Test
-    fun case3() {
+    fun testOnlyWithExistingMemoryDeclarations() {
         //  Case 3:  In the given YAML declaration only memory is defined
         applyTest("memory-deployment.yaml")
     }
 
     @Test
-    fun case4() {
+    fun testWithoutResourceDeclarations() {
         // Case 4: In the given YAML declaration neither `Resource Request` nor `Request Limit` is defined
         applyTest("no-resources-deployment.yaml")
     }
diff --git a/theodolite-quarkus/src/test/kotlin/theodolite/ResourceRequestPatcherTest.kt b/theodolite-quarkus/src/test/kotlin/theodolite/ResourceRequestPatcherTest.kt
index 22d19d221f6b5af3153e767cd14f7c81c3995b01..108142843949913eb6db34bb268eab2e91fda3cf 100644
--- a/theodolite-quarkus/src/test/kotlin/theodolite/ResourceRequestPatcherTest.kt
+++ b/theodolite-quarkus/src/test/kotlin/theodolite/ResourceRequestPatcherTest.kt
@@ -62,25 +62,25 @@ class ResourceRequestPatcherTest {
     }
 
     @Test
-    fun case1() {
+    fun testWithExistingCpuAndMemoryDeclarations() {
         // Case 1: In the given YAML declaration memory and cpu are defined
         applyTest("cpu-memory-deployment.yaml")
     }
 
     @Test
-    fun case2() {
+    fun testOnlyWithExistingCpuDeclarations() {
         // Case 2:  In the given YAML declaration only cpu is defined
         applyTest("cpu-deployment.yaml")
     }
 
     @Test
-    fun case3() {
+    fun testOnlyWithExistingMemoryDeclarations() {
         //  Case 3:  In the given YAML declaration only memory is defined
         applyTest("memory-deployment.yaml")
     }
 
     @Test
-    fun case4() {
+    fun testWithoutResourceDeclarations() {
         // Case 4: In the given YAML declaration neither `Resource Request` nor `Request Limit` is defined
         applyTest("no-resources-deployment.yaml")
     }