diff --git a/theodolite-benchmarks/docker-test/uc1-hazelcastjet-docker-compose/docker-compose.yml b/theodolite-benchmarks/docker-test/uc1-hazelcastjet/docker-compose.yml
similarity index 100%
rename from theodolite-benchmarks/docker-test/uc1-hazelcastjet-docker-compose/docker-compose.yml
rename to theodolite-benchmarks/docker-test/uc1-hazelcastjet/docker-compose.yml
diff --git a/theodolite-benchmarks/docker-test/uc1-hazelcastjet-docker-compose/test.sh b/theodolite-benchmarks/docker-test/uc1-hazelcastjet/test.sh
similarity index 100%
rename from theodolite-benchmarks/docker-test/uc1-hazelcastjet-docker-compose/test.sh
rename to theodolite-benchmarks/docker-test/uc1-hazelcastjet/test.sh
diff --git a/theodolite-benchmarks/docker-test/uc2-hazelcastjet-docker-compose/docker-compose.yml b/theodolite-benchmarks/docker-test/uc2-hazelcastjet/docker-compose.yml
similarity index 100%
rename from theodolite-benchmarks/docker-test/uc2-hazelcastjet-docker-compose/docker-compose.yml
rename to theodolite-benchmarks/docker-test/uc2-hazelcastjet/docker-compose.yml
diff --git a/theodolite-benchmarks/docker-test/uc2-hazelcastjet-docker-compose/test.sh b/theodolite-benchmarks/docker-test/uc2-hazelcastjet/test.sh
similarity index 100%
rename from theodolite-benchmarks/docker-test/uc2-hazelcastjet-docker-compose/test.sh
rename to theodolite-benchmarks/docker-test/uc2-hazelcastjet/test.sh
diff --git a/theodolite-benchmarks/docker-test/uc3-hazelcastjet-docker-compose/docker-compose.yml b/theodolite-benchmarks/docker-test/uc3-hazelcastjet/docker-compose.yml
similarity index 100%
rename from theodolite-benchmarks/docker-test/uc3-hazelcastjet-docker-compose/docker-compose.yml
rename to theodolite-benchmarks/docker-test/uc3-hazelcastjet/docker-compose.yml
diff --git a/theodolite-benchmarks/docker-test/uc3-hazelcastjet-docker-compose/test.sh b/theodolite-benchmarks/docker-test/uc3-hazelcastjet/test.sh
similarity index 100%
rename from theodolite-benchmarks/docker-test/uc3-hazelcastjet-docker-compose/test.sh
rename to theodolite-benchmarks/docker-test/uc3-hazelcastjet/test.sh
diff --git a/theodolite-benchmarks/docker-test/uc4-hazelcastjet-docker-compose/docker-compose.yml b/theodolite-benchmarks/docker-test/uc4-hazelcastjet/docker-compose.yml
similarity index 98%
rename from theodolite-benchmarks/docker-test/uc4-hazelcastjet-docker-compose/docker-compose.yml
rename to theodolite-benchmarks/docker-test/uc4-hazelcastjet/docker-compose.yml
index 2abbefe7984dfb16e97f678c8f938858a0711403..f0e149680cc70e9423bda0b315f077524a8bd858 100644
--- a/theodolite-benchmarks/docker-test/uc4-hazelcastjet-docker-compose/docker-compose.yml
+++ b/theodolite-benchmarks/docker-test/uc4-hazelcastjet/docker-compose.yml
@@ -38,7 +38,7 @@ services:
       SCHEMA_REGISTRY_HOST_NAME: schema-registry
       SCHEMA_REGISTRY_KAFKASTORE_BOOTSTRAP_SERVERS: kafka:9092
   benchmark:
-    image: uc4-hazelcastjet
+    image: hazelcast-test
     depends_on:
       - schema-registry
       - kafka
diff --git a/theodolite-benchmarks/docker-test/uc4-hazelcastjet-docker-compose/test.sh b/theodolite-benchmarks/docker-test/uc4-hazelcastjet/test.sh
similarity index 100%
rename from theodolite-benchmarks/docker-test/uc4-hazelcastjet-docker-compose/test.sh
rename to theodolite-benchmarks/docker-test/uc4-hazelcastjet/test.sh