diff --git a/theodolite-benchmarks/definitions/uc1-beam-samza/resources/uc1-beam-samza-service.yaml b/theodolite-benchmarks/definitions/uc1-beam-samza/resources/beam-samza-service.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc1-beam-samza/resources/uc1-beam-samza-service.yaml
rename to theodolite-benchmarks/definitions/uc1-beam-samza/resources/beam-samza-service.yaml
diff --git a/theodolite-benchmarks/definitions/uc1-beam-samza/resources/uc1-service-monitor.yaml b/theodolite-benchmarks/definitions/uc1-beam-samza/resources/service-monitor.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc1-beam-samza/resources/uc1-service-monitor.yaml
rename to theodolite-benchmarks/definitions/uc1-beam-samza/resources/service-monitor.yaml
diff --git a/theodolite-benchmarks/definitions/uc1-beam-samza/resources/uc1-beam-samza-deployment.yaml b/theodolite-benchmarks/definitions/uc1-beam-samza/resources/uc1-beam-samza-deployment.yaml
index f30a795e5f19848d8a2870148856eed58b366f36..9a0916f4705482ee5884d5a8bd67d5629182c684 100644
--- a/theodolite-benchmarks/definitions/uc1-beam-samza/resources/uc1-beam-samza-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc1-beam-samza/resources/uc1-beam-samza-deployment.yaml
@@ -1,24 +1,22 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: uc1-beam-samza
+  name: titan-ccp-aggregation
 spec:
   selector:
     matchLabels:
-      app: uc1-beam-samza
+      app: titan-ccp-aggregation
   replicas: 1
   template:
     metadata:
       labels:
-        app: uc1-beam-samza
+        app: titan-ccp-aggregation
     spec:
       terminationGracePeriodSeconds: 0
       containers:
         - name: uc1-beam-samza
           image: ghcr.io/cau-se/theodolite-uc1-beam-samza:latest
           ports:
-            - containerPort: 5555
-              name: jmx
           env:
             - name: SAMZA_JOB_COORDINATOR_ZK_CONNECT
               value: "theodolite-cp-zookeeper:2181"
diff --git a/theodolite-benchmarks/definitions/uc1-beam-samza/resources/uc1-jmx-configmap.yaml b/theodolite-benchmarks/definitions/uc1-beam-samza/resources/uc1-jmx-configmap.yaml
deleted file mode 100644
index af8707291f982201eda215133fb099398d9f940a..0000000000000000000000000000000000000000
--- a/theodolite-benchmarks/definitions/uc1-beam-samza/resources/uc1-jmx-configmap.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: uc1-jmx-configmap
-data:
-  jmx-kafka-prometheus.yml: |+
-    jmxUrl: service:jmx:rmi:///jndi/rmi://localhost:5555/jmxrmi
-    lowercaseOutputName: true
-    lowercaseOutputLabelNames: true
-    ssl: false
diff --git a/theodolite-benchmarks/definitions/uc1-beam-samza/uc1-beam-samza-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc1-beam-samza/uc1-beam-samza-benchmark-operator.yaml
index e72239cbfe2b4f703f2d18b4f7fd730d5c019d52..f54bec71592ff94d5a9b553ea9747d522b8121e0 100644
--- a/theodolite-benchmarks/definitions/uc1-beam-samza/uc1-beam-samza-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc1-beam-samza/uc1-beam-samza-benchmark-operator.yaml
@@ -9,10 +9,9 @@ spec:
           name: "benchmark-resources-uc1-beam-samza"
           files:
           - "uc1-beam-samza-deployment.yaml"
-          - "uc1-beam-samza-service.yaml"
-          - "uc1-jmx-configmap.yaml"
-          - "uc1-service-monitor.yaml"
-          afterActions:
+          - "beam-samza-service.yaml"
+          - "service-monitor.yaml"
+    afterActions:
       - selector: # delete zookeeper nodes to reset zookeeper
           pod:
             matchLabels:
@@ -20,7 +19,7 @@ spec:
           container: "cp-zookeeper-server"
         exec:
           command: ["zookeeper-shell", "localhost:2181",
-           "deleteall", "/app-theodolite-uc2-application-1"]
+          "deleteall", "/app-theodolite-uc2-application-1"]
           timeoutSeconds: 60
   loadGenerator:
     resources:
diff --git a/theodolite-benchmarks/definitions/uc2-beam-samza/resources/uc2-beam-samza-service.yaml b/theodolite-benchmarks/definitions/uc2-beam-samza/resources/beam-samza-service.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc2-beam-samza/resources/uc2-beam-samza-service.yaml
rename to theodolite-benchmarks/definitions/uc2-beam-samza/resources/beam-samza-service.yaml
diff --git a/theodolite-benchmarks/definitions/uc2-beam-samza/resources/uc2-service-monitor.yaml b/theodolite-benchmarks/definitions/uc2-beam-samza/resources/service-monitor.yaml
similarity index 100%
rename from theodolite-benchmarks/definitions/uc2-beam-samza/resources/uc2-service-monitor.yaml
rename to theodolite-benchmarks/definitions/uc2-beam-samza/resources/service-monitor.yaml
diff --git a/theodolite-benchmarks/definitions/uc2-beam-samza/resources/uc2-beam-samza-deployment.yaml b/theodolite-benchmarks/definitions/uc2-beam-samza/resources/uc2-beam-samza-deployment.yaml
index 22c1b4e15c22913f06279bd5d5eeca0ea8da2f84..49e5b37ab58cf16a0406eed57c1c401f6147dac8 100644
--- a/theodolite-benchmarks/definitions/uc2-beam-samza/resources/uc2-beam-samza-deployment.yaml
+++ b/theodolite-benchmarks/definitions/uc2-beam-samza/resources/uc2-beam-samza-deployment.yaml
@@ -1,24 +1,21 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: uc2-beam-samza
+  name: titan-ccp-aggregation
 spec:
   selector:
     matchLabels:
-      app: uc2-beam-samza
+      app: titan-ccp-aggregation
   replicas: 1
   template:
     metadata:
       labels:
-        app: uc2-beam-samza
+        app: titan-ccp-aggregation
     spec:
       terminationGracePeriodSeconds: 0
       containers:
         - name: uc2-beam-samza
           image: ghcr.io/cau-se/theodolite-uc1-beam-samza:latest
-          ports:
-            - containerPort: 5555
-              name: jmx
           env:
             - name: SAMZA_JOB_COORDINATOR_ZK_CONNECT
               value: "theodolite-cp-zookeeper:2181"
diff --git a/theodolite-benchmarks/definitions/uc2-beam-samza/uc2-beam-samza-benchmark-operator.yaml b/theodolite-benchmarks/definitions/uc2-beam-samza/uc2-beam-samza-benchmark-operator.yaml
index dc45a90142ef58bd55fb0ec061d429a97490c461..f338d14971142a8e65c9b06788c03a8826bdf4aa 100644
--- a/theodolite-benchmarks/definitions/uc2-beam-samza/uc2-beam-samza-benchmark-operator.yaml
+++ b/theodolite-benchmarks/definitions/uc2-beam-samza/uc2-beam-samza-benchmark-operator.yaml
@@ -9,8 +9,8 @@ spec:
           name: "benchmark-resources-uc2-beam-samza"
           files:
           - "uc2-beam-samza-deployment.yaml"
-          - "uc2-beam-samza-service.yaml"
-          - "uc2-service-monitor.yaml"
+          - "beam-samza-service.yaml"
+          - "service-monitor.yaml"
     # beforeActions:
     #   - selector: # delete zookeeper nodes to reset zookeeper
     #       pod: