diff --git a/src/test/java/org/openepics/names/docker/HealthcheckIT.java b/src/test/java/org/openepics/names/docker/HealthcheckIT.java
index aa1e0554828d0f217e652a7465529aa4d8a10448..09ca51b8d7eb55d6c3a5f8d300a03d70fe0bbc4e 100644
--- a/src/test/java/org/openepics/names/docker/HealthcheckIT.java
+++ b/src/test/java/org/openepics/names/docker/HealthcheckIT.java
@@ -36,7 +36,7 @@ import org.testcontainers.junit.jupiter.Testcontainers;
  * with docker-compose.yml / Dockerfile.
  *
  * <p>
- * Focus of this class is healthcheck endpoint.
+ * Purpose of this class is to test healthcheck endpoint.
  * In practice, it means means to have Naming and PostgreSQL up and running.
  * </p>
  *
diff --git a/src/test/java/org/openepics/names/docker/NamesIT.java b/src/test/java/org/openepics/names/docker/NamesIT.java
index 925958f3f508834872ccb7c7bca884ccf0c01c59..509dabd2e03bfd150d78c1fb65397029d0ee326a 100644
--- a/src/test/java/org/openepics/names/docker/NamesIT.java
+++ b/src/test/java/org/openepics/names/docker/NamesIT.java
@@ -53,7 +53,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
  * with docker-compose.yml / Dockerfile.
  *
  * <p>
- * Focus of this class is names endpoint.
+ * Purpose of this class is to test names endpoints.
  * </p>
  *
  * @author Lars Johansson
diff --git a/src/test/java/org/openepics/names/docker/ReportIT.java b/src/test/java/org/openepics/names/docker/ReportIT.java
index cfe359096513cc2badeafe5a913bc1d522749ae3..53e0b27cb62fbbd7808116ee9b984f140e7b6f8f 100644
--- a/src/test/java/org/openepics/names/docker/ReportIT.java
+++ b/src/test/java/org/openepics/names/docker/ReportIT.java
@@ -36,7 +36,7 @@ import org.testcontainers.junit.jupiter.Testcontainers;
  * with docker-compose.yml / Dockerfile.
  *
  * <p>
- * Focus of this class is report endpoint.
+ * Purpose of this class is to test report endpoints.
  * </p>
  *
  * @author Lars Johansson
diff --git a/src/test/java/org/openepics/names/docker/StructuresDeviceGroupIT.java b/src/test/java/org/openepics/names/docker/StructuresDeviceGroupIT.java
index adc7e1738ce0b3d342ff789a7c01bb9f5aa7cc12..86fbba7728fcfdd414e29092fe2f8e77abc697a1 100644
--- a/src/test/java/org/openepics/names/docker/StructuresDeviceGroupIT.java
+++ b/src/test/java/org/openepics/names/docker/StructuresDeviceGroupIT.java
@@ -47,7 +47,7 @@ import org.testcontainers.junit.jupiter.Testcontainers;
  * with docker-compose.yml / Dockerfile.
  *
  * <p>
- * Focus of this class is structures endpoint and device group.
+ * Purpose of this class is to test structures endpoints and device group.
  * </p>
  *
  * @author Lars Johansson
diff --git a/src/test/java/org/openepics/names/docker/StructuresDeviceTypeIT.java b/src/test/java/org/openepics/names/docker/StructuresDeviceTypeIT.java
index 0a19f4d49038a31d94f80a23c2ee2deba350d4cb..7fab4faaa5a8cec19602e7bc24e0c04f000f8127 100644
--- a/src/test/java/org/openepics/names/docker/StructuresDeviceTypeIT.java
+++ b/src/test/java/org/openepics/names/docker/StructuresDeviceTypeIT.java
@@ -47,7 +47,7 @@ import org.testcontainers.junit.jupiter.Testcontainers;
  * with docker-compose.yml / Dockerfile.
  *
  * <p>
- * Focus of this class is structures endpoint and device type.
+ * Purpose of this class is to test structures endpoints and device type.
  * </p>
  *
  * @author Lars Johansson
diff --git a/src/test/java/org/openepics/names/docker/StructuresDisciplineIT.java b/src/test/java/org/openepics/names/docker/StructuresDisciplineIT.java
index 2d8c4ffdcfde9bcb6108a857e4134c78761841a0..15d0bbf7d1e5d6e9e8831cc865ec139cdf2a5267 100644
--- a/src/test/java/org/openepics/names/docker/StructuresDisciplineIT.java
+++ b/src/test/java/org/openepics/names/docker/StructuresDisciplineIT.java
@@ -46,7 +46,7 @@ import org.testcontainers.junit.jupiter.Testcontainers;
  * with docker-compose.yml / Dockerfile.
  *
  * <p>
- * Focus of this class is structures endpoint and discipline.
+ * Purpose of this class is to test structures endpoints and discipline.
  * </p>
  *
  * @author Lars Johansson
diff --git a/src/test/java/org/openepics/names/docker/StructuresSubsystemIT.java b/src/test/java/org/openepics/names/docker/StructuresSubsystemIT.java
index 72f8816dffa8fee8648c689e2cc3fabb7c575fdb..ff4d4cd5eddc38bd4b0f62e6e2d49f743e4eaa7e 100644
--- a/src/test/java/org/openepics/names/docker/StructuresSubsystemIT.java
+++ b/src/test/java/org/openepics/names/docker/StructuresSubsystemIT.java
@@ -47,7 +47,7 @@ import org.testcontainers.junit.jupiter.Testcontainers;
  * with docker-compose.yml / Dockerfile.
  *
  * <p>
- * Focus of this class is structures endpoint and subsystem.
+ * Purpose of this class is to test structures endpoints and subsystem.
  * </p>
  *
  * @author Lars Johansson
diff --git a/src/test/java/org/openepics/names/docker/StructuresSystemGroupIT.java b/src/test/java/org/openepics/names/docker/StructuresSystemGroupIT.java
index fb630b58548e6f2147d05f40ca47e9815d2d3892..8c0f4836297252fd128e3060b4384534ca4d5b1f 100644
--- a/src/test/java/org/openepics/names/docker/StructuresSystemGroupIT.java
+++ b/src/test/java/org/openepics/names/docker/StructuresSystemGroupIT.java
@@ -47,7 +47,7 @@ import org.testcontainers.junit.jupiter.Testcontainers;
  * with docker-compose.yml / Dockerfile.
  *
  * <p>
- * Focus of this class is structures endpoint and system group.
+ * Purpose of this class is to test structures endpoints and system group.
  * </p>
  *
  * @author Lars Johansson
diff --git a/src/test/java/org/openepics/names/docker/StructuresSystemIT.java b/src/test/java/org/openepics/names/docker/StructuresSystemIT.java
index 1c193affb8dba55e6c460e304a5eb4426f61636f..0a8134c3d3813ba588f4955abc9a393b84bbe933 100644
--- a/src/test/java/org/openepics/names/docker/StructuresSystemIT.java
+++ b/src/test/java/org/openepics/names/docker/StructuresSystemIT.java
@@ -47,7 +47,7 @@ import org.testcontainers.junit.jupiter.Testcontainers;
  * with docker-compose.yml / Dockerfile.
  *
  * <p>
- * Focus of this class is structures endpoint and system.
+ * Purpose of this class is to test structures endpoints and system.
  * </p>
  *
  * @author Lars Johansson
diff --git a/src/test/java/org/openepics/names/docker/complex/NamesInstanceIndexIT.java b/src/test/java/org/openepics/names/docker/complex/NamesInstanceIndexIT.java
index 0d7d24446981ae7405f4974eba701675a4b233e2..f59ccf324171e7a1e4ca3264c706a77eadfafa83 100644
--- a/src/test/java/org/openepics/names/docker/complex/NamesInstanceIndexIT.java
+++ b/src/test/java/org/openepics/names/docker/complex/NamesInstanceIndexIT.java
@@ -44,7 +44,7 @@ import org.testcontainers.junit.jupiter.Testcontainers;
  * with docker-compose.yml / Dockerfile.
  *
  * <p>
- * Focus of this class is names endpoint and rules for disciplines P&ID and Scientific in particular.
+ * Purpose of this class is to test names endpoints and rules for disciplines P&ID and Scientific in particular.
  * In practice, this class contains tests for instance index, en masse.
  * </p>
  *
diff --git a/src/test/java/org/openepics/names/docker/complex/StructuresCUDNamesLegacyIT.java b/src/test/java/org/openepics/names/docker/complex/NamesLegacyIT.java
similarity index 99%
rename from src/test/java/org/openepics/names/docker/complex/StructuresCUDNamesLegacyIT.java
rename to src/test/java/org/openepics/names/docker/complex/NamesLegacyIT.java
index 58f28a9f5e914561dd298491610a6e33bf7af046..037e42434e2b0d615de23038d91eb3eeb9bd6a35 100644
--- a/src/test/java/org/openepics/names/docker/complex/StructuresCUDNamesLegacyIT.java
+++ b/src/test/java/org/openepics/names/docker/complex/NamesLegacyIT.java
@@ -45,14 +45,14 @@ import org.testcontainers.junit.jupiter.Testcontainers;
  * with docker-compose.yml / Dockerfile.
  *
  * <p>
- * Focus of this class is names endpoint and rules for legacy name.
+ * Purpose of this class is to test rules for legacy name.
  * In practice, this class contains tests for structures and names, before and after delete of structures.
  * </p>
  *
  * @author Lars Johansson
  */
 @Testcontainers
-class StructuresCUDNamesLegacyIT {
+class NamesLegacyIT {
 
     // test
     //     name is legacy in various ways
diff --git a/src/test/java/org/openepics/names/docker/complex/StructuresCUDDeleteIT.java b/src/test/java/org/openepics/names/docker/complex/NamesLegacyStructuresDeleteIT.java
similarity index 99%
rename from src/test/java/org/openepics/names/docker/complex/StructuresCUDDeleteIT.java
rename to src/test/java/org/openepics/names/docker/complex/NamesLegacyStructuresDeleteIT.java
index 808212f5b10bf9b77290493c7cb3c76294617ee7..950ae7c5cb046aae1d7b7e67f6a37fbfeae77fb6 100644
--- a/src/test/java/org/openepics/names/docker/complex/StructuresCUDDeleteIT.java
+++ b/src/test/java/org/openepics/names/docker/complex/NamesLegacyStructuresDeleteIT.java
@@ -43,14 +43,14 @@ import org.testcontainers.junit.jupiter.Testcontainers;
  * with docker-compose.yml / Dockerfile.
  *
  * <p>
- * Focus of this class is names endpoint and rules for legacy name.
+ * Purpose of this class is to test rules for legacy name.
  * In practice, this class contains tests for structures and names, before and after delete of structures.
  * </p>
  *
  * @author Lars Johansson
  */
 @Testcontainers
-class StructuresCUDDeleteIT {
+class NamesLegacyStructuresDeleteIT {
 
     // test
     //     create update delete structures and ensure name is as expected
diff --git a/src/test/java/org/openepics/names/docker/complex/StructuresCUDUpdateIT.java b/src/test/java/org/openepics/names/docker/complex/NamesLegacyStructuresUpdateIT.java
similarity index 99%
rename from src/test/java/org/openepics/names/docker/complex/StructuresCUDUpdateIT.java
rename to src/test/java/org/openepics/names/docker/complex/NamesLegacyStructuresUpdateIT.java
index 0b1f655dd1b319d8b85806e5b971ff370363b255..7a58a243ad3fa03b21886ac9953eda96142fcad3 100644
--- a/src/test/java/org/openepics/names/docker/complex/StructuresCUDUpdateIT.java
+++ b/src/test/java/org/openepics/names/docker/complex/NamesLegacyStructuresUpdateIT.java
@@ -43,14 +43,14 @@ import org.testcontainers.junit.jupiter.Testcontainers;
  * with docker-compose.yml / Dockerfile.
  *
  * <p>
- * Focus of this class is names endpoint and rules for legacy name.
+ * Purpose of this class is to test rules for legacy name.
  * In practice, this class contains tests for structures and names, before and after update of structures.
  * </p>
  *
  * @author Lars Johansson
  */
 @Testcontainers
-class StructuresCUDUpdateIT {
+class NamesLegacyStructuresUpdateIT {
 
     // test
     //     create update delete structures and ensure name is as expected
diff --git a/src/test/java/org/openepics/names/docker/complex/NamesMultipleIT.java b/src/test/java/org/openepics/names/docker/complex/NamesMultipleIT.java
index 72f6813e9283328fb0cdec2b8bef41d3448dc82f..9036727cbe64cf95acba4a0e9e5912342dabc381 100644
--- a/src/test/java/org/openepics/names/docker/complex/NamesMultipleIT.java
+++ b/src/test/java/org/openepics/names/docker/complex/NamesMultipleIT.java
@@ -50,7 +50,7 @@ import org.testcontainers.junit.jupiter.Testcontainers;
  * with docker-compose.yml / Dockerfile.
  *
  * <p>
- * Focus of this class is names endpoint.
+ * Purpose of this class is to test names endpoints.
  * In particular, purpose is to test arrays of names.
  * </p>
  *
diff --git a/src/test/java/org/openepics/names/docker/complex/StructuresLevel3IT.java b/src/test/java/org/openepics/names/docker/complex/StructuresLevel3IT.java
index 49fc48d2d71745e811008c13f907bb32f7e73109..d395e95b1a94e067d747c158a9a12a7eb48d66fd 100644
--- a/src/test/java/org/openepics/names/docker/complex/StructuresLevel3IT.java
+++ b/src/test/java/org/openepics/names/docker/complex/StructuresLevel3IT.java
@@ -42,8 +42,8 @@ import org.testcontainers.junit.jupiter.Testcontainers;
  * with docker-compose.yml / Dockerfile.
  *
  * <p>
- * Focus of this class is structures endpoints. In particular create level 3 entries
- * and create all entries before approve all entries.
+ * Purpose of this class is to test structures endpoints.
+ * In particular create level 3 entries and create all entries before approve all entries.
  * </p>
  *
  * @author Lars Johansson
diff --git a/src/test/java/org/openepics/names/docker/complex/StructuresMultipleIT.java b/src/test/java/org/openepics/names/docker/complex/StructuresMultipleIT.java
index 15689f5c585bc083fc430dedc99837c090a18fce..7576f7878ca828c4a5688ace4ceeb6b7125c6fca 100644
--- a/src/test/java/org/openepics/names/docker/complex/StructuresMultipleIT.java
+++ b/src/test/java/org/openepics/names/docker/complex/StructuresMultipleIT.java
@@ -47,7 +47,7 @@ import org.testcontainers.junit.jupiter.Testcontainers;
  * with docker-compose.yml / Dockerfile.
  *
  * <p>
- * Focus of this class is structures endpoint and system.
+ * Purpose of this class is to test structures endpoints.
  * In particular, purpose is to test arrays of structures.
  * </p>
  *
diff --git a/src/test/resources/INTEGRATIONTEST_DOCKER_RUN.md b/src/test/resources/INTEGRATIONTEST_DOCKER_RUN.md
index eb89c486f73464e017375df3a2946a0091ff834a..c19b8045d6173acdebf62249bcd15b024264993b 100644
--- a/src/test/resources/INTEGRATIONTEST_DOCKER_RUN.md
+++ b/src/test/resources/INTEGRATIONTEST_DOCKER_RUN.md
@@ -39,10 +39,10 @@ mvn test -Dtest=org.openepics.names.docker.SubsystemIT
 mvn test -Dtest=org.openepics.names.docker.SystemGroupIT
 mvn test -Dtest=org.openepics.names.docker.SystemIT
 mvn test -Dtest=org.openepics.names.docker.complex.NamesInstanceIndexIT
+mvn test -Dtest=org.openepics.names.docker.complex.NamesLegacyIT
+mvn test -Dtest=org.openepics.names.docker.complex.NamesLegacyStructuresDeleteIT
+mvn test -Dtest=org.openepics.names.docker.complex.NamesLegacyStructuresUpdateIT
 mvn test -Dtest=org.openepics.names.docker.complex.NamesMultipleIT
-mvn test -Dtest=org.openepics.names.docker.complex.StructuresCUDDeleteIT
-mvn test -Dtest=org.openepics.names.docker.complex.StructuresCUDNamesLegacyIT
-mvn test -Dtest=org.openepics.names.docker.complex.StructuresCUDUpdateIT
 mvn test -Dtest=org.openepics.names.docker.complex.StructuresLevel3IT
 mvn test -Dtest=org.openepics.names.docker.complex.StructuresMultipleIT
 ```