diff --git a/test/src/test/kotlin/graphql/nadel/tests/hooks/batch-hydration-instruction-hook-returns-null.kt b/test/src/test/kotlin/graphql/nadel/tests/hooks/batch-hydration-instruction-hook-returns-null.kt
index 054916b09..6d25d772b 100644
--- a/test/src/test/kotlin/graphql/nadel/tests/hooks/batch-hydration-instruction-hook-returns-null.kt
+++ b/test/src/test/kotlin/graphql/nadel/tests/hooks/batch-hydration-instruction-hook-returns-null.kt
@@ -9,7 +9,7 @@ import graphql.nadel.tests.EngineTestHook
 import graphql.nadel.tests.UseHook
 
 @UseHook
-class `new-batch-hydration-instruction-hook-returns-null` : EngineTestHook {
+class `batch-hydration-instruction-hook-returns-null` : EngineTestHook {
     override fun makeNadel(builder: Nadel.Builder): Nadel.Builder {
         return super.makeNadel(builder)
             .executionHooks(
diff --git a/test/src/test/kotlin/graphql/nadel/tests/hooks/new-batching-absent-source-input.kt b/test/src/test/kotlin/graphql/nadel/tests/hooks/batching-absent-source-input.kt
similarity index 97%
rename from test/src/test/kotlin/graphql/nadel/tests/hooks/new-batching-absent-source-input.kt
rename to test/src/test/kotlin/graphql/nadel/tests/hooks/batching-absent-source-input.kt
index 7e5c1e8f1..2a99cd567 100644
--- a/test/src/test/kotlin/graphql/nadel/tests/hooks/new-batching-absent-source-input.kt
+++ b/test/src/test/kotlin/graphql/nadel/tests/hooks/batching-absent-source-input.kt
@@ -9,7 +9,7 @@ import graphql.nadel.tests.EngineTestHook
 import graphql.nadel.tests.UseHook
 
 @UseHook
-class `new-batching-absent-source-input` : EngineTestHook {
+class `batching-absent-source-input` : EngineTestHook {
     override fun makeNadel(builder: Nadel.Builder): Nadel.Builder {
         return super.makeNadel(builder)
             .executionHooks(
diff --git a/test/src/test/kotlin/graphql/nadel/tests/hooks/new-batching-conditional-hydration-in-abstract-type.kt b/test/src/test/kotlin/graphql/nadel/tests/hooks/batching-conditional-hydration-in-abstract-type.kt
similarity index 93%
rename from test/src/test/kotlin/graphql/nadel/tests/hooks/new-batching-conditional-hydration-in-abstract-type.kt
rename to test/src/test/kotlin/graphql/nadel/tests/hooks/batching-conditional-hydration-in-abstract-type.kt
index 0babe0056..0f367ae5c 100644
--- a/test/src/test/kotlin/graphql/nadel/tests/hooks/new-batching-conditional-hydration-in-abstract-type.kt
+++ b/test/src/test/kotlin/graphql/nadel/tests/hooks/batching-conditional-hydration-in-abstract-type.kt
@@ -8,7 +8,7 @@ import graphql.nadel.tests.EngineTestHook
 import graphql.nadel.tests.UseHook
 
 @UseHook
-class `new-batching-conditional-hydration-in-abstract-type` : EngineTestHook {
+class `batching-conditional-hydration-in-abstract-type` : EngineTestHook {
     override fun makeNadel(builder: Nadel.Builder): Nadel.Builder {
         return super.makeNadel(builder)
             .executionHooks(
diff --git a/test/src/test/kotlin/graphql/nadel/tests/hooks/new-batching-multiple-source-ids-going-to-different-services.kt b/test/src/test/kotlin/graphql/nadel/tests/hooks/batching-multiple-source-ids-going-to-different-services.kt
similarity index 92%
rename from test/src/test/kotlin/graphql/nadel/tests/hooks/new-batching-multiple-source-ids-going-to-different-services.kt
rename to test/src/test/kotlin/graphql/nadel/tests/hooks/batching-multiple-source-ids-going-to-different-services.kt
index 8829552ca..f9a0a5f04 100644
--- a/test/src/test/kotlin/graphql/nadel/tests/hooks/new-batching-multiple-source-ids-going-to-different-services.kt
+++ b/test/src/test/kotlin/graphql/nadel/tests/hooks/batching-multiple-source-ids-going-to-different-services.kt
@@ -8,7 +8,7 @@ import graphql.nadel.tests.EngineTestHook
 import graphql.nadel.tests.UseHook
 
 @UseHook
-class `new-batching-multiple-source-ids-going-to-different-services` : EngineTestHook {
+class `batching-multiple-source-ids-going-to-different-services` : EngineTestHook {
     override fun makeNadel(builder: Nadel.Builder): Nadel.Builder {
         return super.makeNadel(builder)
             .executionHooks(
diff --git a/test/src/test/kotlin/graphql/nadel/tests/hooks/batching-of-hydration-list-with-partition.kt b/test/src/test/kotlin/graphql/nadel/tests/hooks/batching-of-hydration-list-with-partition.kt
index d20eaef24..052f80c63 100644
--- a/test/src/test/kotlin/graphql/nadel/tests/hooks/batching-of-hydration-list-with-partition.kt
+++ b/test/src/test/kotlin/graphql/nadel/tests/hooks/batching-of-hydration-list-with-partition.kt
@@ -41,7 +41,7 @@ class `batching-of-hydration-list-with-partition` : EngineTestHook {
 }
 
 @UseHook
-class `new-batching-of-hydration-list-with-partition-2` : EngineTestHook {
+class `batching-of-hydration-list-with-partition-2` : EngineTestHook {
     override fun makeNadel(builder: Nadel.Builder): Nadel.Builder {
         return builder.executionHooks(BatchHydrationHooks())
     }
diff --git a/test/src/test/kotlin/graphql/nadel/tests/hooks/new-batching-single-source-id.kt b/test/src/test/kotlin/graphql/nadel/tests/hooks/batching-single-source-id.kt
similarity index 97%
rename from test/src/test/kotlin/graphql/nadel/tests/hooks/new-batching-single-source-id.kt
rename to test/src/test/kotlin/graphql/nadel/tests/hooks/batching-single-source-id.kt
index ed64d2478..ff73083ef 100644
--- a/test/src/test/kotlin/graphql/nadel/tests/hooks/new-batching-single-source-id.kt
+++ b/test/src/test/kotlin/graphql/nadel/tests/hooks/batching-single-source-id.kt
@@ -12,7 +12,7 @@ import graphql.nadel.tests.EngineTestHook
 import graphql.nadel.tests.UseHook
 
 @UseHook
-class `new-batching-single-source-id` : EngineTestHook {
+class `batching-single-source-id` : EngineTestHook {
     override fun makeNadel(builder: Nadel.Builder): Nadel.Builder {
         return super.makeNadel(builder)
             .executionHooks(
diff --git a/test/src/test/kotlin/graphql/nadel/tests/hooks/new-batching-no-source-inputs.kt b/test/src/test/kotlin/graphql/nadel/tests/hooks/new-batching-no-source-inputs.kt
index 076e933e9..3999f88bc 100644
--- a/test/src/test/kotlin/graphql/nadel/tests/hooks/new-batching-no-source-inputs.kt
+++ b/test/src/test/kotlin/graphql/nadel/tests/hooks/new-batching-no-source-inputs.kt
@@ -8,7 +8,7 @@ import graphql.nadel.tests.EngineTestHook
 import graphql.nadel.tests.UseHook
 
 @UseHook
-class `new-batching-no-source-inputs` : EngineTestHook {
+class `batching-no-source-inputs` : EngineTestHook {
     override fun makeNadel(builder: Nadel.Builder): Nadel.Builder {
         return super.makeNadel(builder)
             .executionHooks(
diff --git a/test/src/test/kotlin/graphql/nadel/tests/hooks/polymorphic-hydration-hook-using-alias-helper.kt b/test/src/test/kotlin/graphql/nadel/tests/hooks/polymorphic-hydration-hook-using-alias-helper.kt
index 92217e85c..d3556f442 100644
--- a/test/src/test/kotlin/graphql/nadel/tests/hooks/polymorphic-hydration-hook-using-alias-helper.kt
+++ b/test/src/test/kotlin/graphql/nadel/tests/hooks/polymorphic-hydration-hook-using-alias-helper.kt
@@ -70,7 +70,7 @@ class `batch-polymorphic-hydration-actor-fields-are-in-the-same-service-return-t
     PolymorphicHydrationWithAliasTestHook()
 
 @UseHook
-class `new-batch-polymorphic-hydrations-are-executed-in-parallel` : PolymorphicHydrationWithAliasTestHook() {
+class `batch-polymorphic-hydrations-are-executed-in-parallel` : PolymorphicHydrationWithAliasTestHook() {
     private val coroutineScope = CoroutineScope(Dispatchers.Default)
 
     override fun makeNadel(builder: Nadel.Builder): Nadel.Builder {
diff --git a/test/src/test/kotlin/graphql/nadel/tests/hooks/new-polymorphic-hydration-instructions-use-different-inputs.kt b/test/src/test/kotlin/graphql/nadel/tests/hooks/polymorphic-hydration-instructions-use-different-inputs.kt
similarity index 95%
rename from test/src/test/kotlin/graphql/nadel/tests/hooks/new-polymorphic-hydration-instructions-use-different-inputs.kt
rename to test/src/test/kotlin/graphql/nadel/tests/hooks/polymorphic-hydration-instructions-use-different-inputs.kt
index e0ec1e194..7a5e1ec6a 100644
--- a/test/src/test/kotlin/graphql/nadel/tests/hooks/new-polymorphic-hydration-instructions-use-different-inputs.kt
+++ b/test/src/test/kotlin/graphql/nadel/tests/hooks/polymorphic-hydration-instructions-use-different-inputs.kt
@@ -9,7 +9,7 @@ import graphql.nadel.tests.EngineTestHook
 import graphql.nadel.tests.UseHook
 
 @UseHook
-class `new-polymorphic-hydration-instructions-use-different-inputs` : EngineTestHook {
+class `polymorphic-hydration-instructions-use-different-inputs` : EngineTestHook {
     override fun makeNadel(builder: Nadel.Builder): Nadel.Builder {
         return super.makeNadel(builder)
             .executionHooks(