diff --git a/test/configs/zombieDanceboxUpgrade.json b/test/configs/zombie_dancebox_upgrade.json
similarity index 100%
rename from test/configs/zombieDanceboxUpgrade.json
rename to test/configs/zombie_dancebox_upgrade.json
diff --git a/test/configs/zombieDancelightUpgrade.json b/test/configs/zombie_dancelight_upgrade.json
similarity index 100%
rename from test/configs/zombieDancelightUpgrade.json
rename to test/configs/zombie_dancelight_upgrade.json
diff --git a/test/configs/zombieDataPreservers.json b/test/configs/zombie_data_preservers.json
similarity index 100%
rename from test/configs/zombieDataPreservers.json
rename to test/configs/zombie_data_preservers.json
diff --git a/test/configs/zombieFlashbox.json b/test/configs/zombie_flashbox.json
similarity index 100%
rename from test/configs/zombieFlashbox.json
rename to test/configs/zombie_flashbox.json
diff --git a/test/configs/zombieTemplateUpgradeFrontier.json b/test/configs/zombie_frontier_template_upgrade.json
similarity index 100%
rename from test/configs/zombieTemplateUpgradeFrontier.json
rename to test/configs/zombie_frontier_template_upgrade.json
diff --git a/test/configs/zombieDancelightSingleContainer.json b/test/configs/zombie_simple_template_offchain.json
similarity index 100%
rename from test/configs/zombieDancelightSingleContainer.json
rename to test/configs/zombie_simple_template_offchain.json
diff --git a/test/configs/zombieTemplateUpgradeSimple.json b/test/configs/zombie_simple_template_upgrade.json
similarity index 100%
rename from test/configs/zombieTemplateUpgradeSimple.json
rename to test/configs/zombie_simple_template_upgrade.json
diff --git a/test/configs/zombieTanssi.json b/test/configs/zombie_tanssi.json
similarity index 100%
rename from test/configs/zombieTanssi.json
rename to test/configs/zombie_tanssi.json
diff --git a/test/configs/zombieTanssiKeepDb.json b/test/configs/zombie_tanssi_keep_db.json
similarity index 100%
rename from test/configs/zombieTanssiKeepDb.json
rename to test/configs/zombie_tanssi_keep_db.json
diff --git a/test/configs/zombieTanssiMetrics.json b/test/configs/zombie_tanssi_metrics.json
similarity index 100%
rename from test/configs/zombieTanssiMetrics.json
rename to test/configs/zombie_tanssi_metrics.json
diff --git a/test/configs/zombieTanssiOneNode.json b/test/configs/zombie_tanssi_one_node.json
similarity index 100%
rename from test/configs/zombieTanssiOneNode.json
rename to test/configs/zombie_tanssi_one_node.json
diff --git a/test/configs/zombieTanssiParathreads.json b/test/configs/zombie_tanssi_parathreads.json
similarity index 100%
rename from test/configs/zombieTanssiParathreads.json
rename to test/configs/zombie_tanssi_parathreads.json
diff --git a/test/configs/zombieDancelight.json b/test/configs/zombie_tanssi_relay.json
similarity index 100%
rename from test/configs/zombieDancelight.json
rename to test/configs/zombie_tanssi_relay.json
diff --git a/test/configs/zombieDancelightBridge.json b/test/configs/zombie_tanssi_relay_eth_bridge.json
similarity index 100%
rename from test/configs/zombieDancelightBridge.json
rename to test/configs/zombie_tanssi_relay_eth_bridge.json
diff --git a/test/configs/zombieDancelightUnneededPara.json b/test/configs/zombie_tanssi_relay_unneeded_para.json
similarity index 100%
rename from test/configs/zombieDancelightUnneededPara.json
rename to test/configs/zombie_tanssi_relay_unneeded_para.json
diff --git a/test/configs/zombieTanssiRotation.json b/test/configs/zombie_tanssi_rotation.json
similarity index 100%
rename from test/configs/zombieTanssiRotation.json
rename to test/configs/zombie_tanssi_rotation.json
diff --git a/test/configs/zombieTanssiWarpSync.json b/test/configs/zombie_tanssi_warp_sync.json
similarity index 100%
rename from test/configs/zombieTanssiWarpSync.json
rename to test/configs/zombie_tanssi_warp_sync.json
diff --git a/test/moonwall.config.json b/test/moonwall.config.json
index 049bcdaf1..965eb7d2c 100644
--- a/test/moonwall.config.json
+++ b/test/moonwall.config.json
@@ -189,7 +189,7 @@
         {
             "name": "zombie_flashbox",
             "timeout": 600000,
-            "testFileDir": ["suites/para"],
+            "testFileDir": ["suites/zombie_tanssi"],
             "runScripts": [
                 "build-spec-flashbox.sh",
                 "download-polkadot.sh",
@@ -200,7 +200,7 @@
             "foundation": {
                 "type": "zombie",
                 "zombieSpec": {
-                    "configPath": "./configs/zombieFlashbox.json",
+                    "configPath": "./configs/zombie_flashbox.json",
                     "skipBlockCheck": ["Container2002"]
                 }
             },
@@ -245,7 +245,7 @@
         {
             "name": "zombie_tanssi",
             "timeout": 600000,
-            "testFileDir": ["suites/para"],
+            "testFileDir": ["suites/zombie_tanssi"],
             "runScripts": [
                 "build-spec.sh",
                 "download-polkadot.sh",
@@ -256,7 +256,7 @@
             "foundation": {
                 "type": "zombie",
                 "zombieSpec": {
-                    "configPath": "./configs/zombieTanssi.json",
+                    "configPath": "./configs/zombie_tanssi.json",
                     "skipBlockCheck": ["Container2002"]
                 }
             },
@@ -300,7 +300,7 @@
         },
         {
             "name": "zombie_tanssi_keep_db",
-            "testFileDir": ["suites/keep-db"],
+            "testFileDir": ["suites/zombie_tanssi_keep_db"],
             "runScripts": [
                 "build-spec-single-container.sh",
                 "download-polkadot.sh",
@@ -311,7 +311,7 @@
             "foundation": {
                 "type": "zombie",
                 "zombieSpec": {
-                    "configPath": "./configs/zombieTanssiKeepDb.json"
+                    "configPath": "./configs/zombie_tanssi_keep_db.json"
                 }
             },
             "connections": [
@@ -334,7 +334,7 @@
         },
         {
             "name": "zombie_tanssi_metrics",
-            "testFileDir": ["suites/metrics"],
+            "testFileDir": ["suites/zombie_tanssi_metrics"],
             "runScripts": [
                 "build-spec-single-container.sh",
                 "download-polkadot.sh",
@@ -345,7 +345,7 @@
             "foundation": {
                 "type": "zombie",
                 "zombieSpec": {
-                    "configPath": "./configs/zombieTanssiMetrics.json"
+                    "configPath": "./configs/zombie_tanssi_metrics.json"
                 }
             },
             "connections": [
@@ -369,7 +369,7 @@
         {
             "name": "zombie_tanssi_one_node",
             "timeout": 600000,
-            "testFileDir": ["suites/one-node"],
+            "testFileDir": ["suites/zombie_tanssi_one_node"],
             "runScripts": [
                 "build-spec-one-node.sh",
                 "download-polkadot.sh",
@@ -378,7 +378,7 @@
             "foundation": {
                 "type": "zombie",
                 "zombieSpec": {
-                    "configPath": "./configs/zombieTanssiOneNode.json",
+                    "configPath": "./configs/zombie_tanssi_one_node.json",
                     "skipBlockCheck": ["Container2000", "Container2001"]
                 }
             },
@@ -398,7 +398,7 @@
         {
             "name": "zombie_tanssi_parathreads",
             "timeout": 600000,
-            "testFileDir": ["suites/parathreads"],
+            "testFileDir": ["suites/zombie_tanssi_parathreads"],
             "runScripts": [
                 "build-spec-parathreads.sh",
                 "download-polkadot.sh",
@@ -409,7 +409,7 @@
             "foundation": {
                 "type": "zombie",
                 "zombieSpec": {
-                    "configPath": "./configs/zombieTanssiParathreads.json",
+                    "configPath": "./configs/zombie_tanssi_parathreads.json",
                     "skipBlockCheck": ["Container2000", "Container2001"]
                 }
             },
@@ -448,7 +448,7 @@
         },
         {
             "name": "zombie_tanssi_rotation",
-            "testFileDir": ["suites/rotation-para"],
+            "testFileDir": ["suites/zombie_tanssi_rotation"],
             "runScripts": [
                 "build-spec.sh",
                 "download-polkadot.sh",
@@ -460,7 +460,7 @@
             "foundation": {
                 "type": "zombie",
                 "zombieSpec": {
-                    "configPath": "./configs/zombieTanssiRotation.json"
+                    "configPath": "./configs/zombie_tanssi_rotation.json"
                 }
             },
             "connections": [
@@ -498,7 +498,7 @@
         },
         {
             "name": "zombie_tanssi_warp_sync",
-            "testFileDir": ["suites/warp-sync"],
+            "testFileDir": ["suites/zombie_tanssi_warp_sync"],
             "runScripts": [
                 "build-spec-single-container.sh",
                 "download-polkadot.sh",
@@ -509,7 +509,7 @@
             "foundation": {
                 "type": "zombie",
                 "zombieSpec": {
-                    "configPath": "./configs/zombieTanssiWarpSync.json"
+                    "configPath": "./configs/zombie_tanssi_warp_sync.json"
                 }
             },
             "connections": [
@@ -532,21 +532,21 @@
         },
         {
             "name": "zombie_dancebox_upgrade",
-            "testFileDir": ["suites/rt-upgrade-parachain-zombienet"],
+            "testFileDir": ["suites/zombie_dancebox_upgrade"],
             "runScripts": ["download-polkadot.sh"],
             "timeout": 600000,
             "foundation": {
                 "rtUpgradePath": "../target/release/wbuild/dancebox-runtime/dancebox_runtime.compact.compressed.wasm",
                 "type": "zombie",
                 "zombieSpec": {
-                    "configPath": "./configs/zombieDanceboxUpgrade.json",
+                    "configPath": "./configs/zombie_dancebox_upgrade.json",
                     "disableDefaultEthProviders": true
                 }
             }
         },
         {
             "name": "zombie_simple_template_upgrade",
-            "testFileDir": ["suites/rt-upgrade-templates-zombienet"],
+            "testFileDir": ["suites/zombie_simple_template_upgrade"],
             "runScripts": [
                 "download-latest-rt-binaries.sh",
                 "build-spec-single-container.sh tmp container-chain-simple-node flashbox-local",
@@ -559,7 +559,7 @@
                 "rtUpgradePath": "../target/release/wbuild/container-chain-template-simple-runtime/container_chain_template_simple_runtime.compact.compressed.wasm",
                 "type": "zombie",
                 "zombieSpec": {
-                    "configPath": "./configs/zombieTemplateUpgradeSimple.json",
+                    "configPath": "./configs/zombie_simple_template_upgrade.json",
                     "disableDefaultEthProviders": true
                 }
             },
@@ -583,14 +583,14 @@
         },
         {
             "name": "zombie_dancelight_upgrade",
-            "testFileDir": ["suites/rt-upgrade-relay-zombienet"],
+            "testFileDir": ["suites/zombie_dancelight_upgrade"],
             "runScripts": ["download-latest-rt-binaries-starlight.sh", "build-spec-dancelight-single.sh tmp"],
             "timeout": 900000,
             "foundation": {
                 "rtUpgradePath": "../target/release/wbuild/dancelight-runtime/dancelight_runtime.compact.compressed.wasm",
                 "type": "zombie",
                 "zombieSpec": {
-                    "configPath": "./configs/zombieDancelightUpgrade.json",
+                    "configPath": "./configs/zombie_dancelight_upgrade.json",
                     "disableDefaultEthProviders": true
                 }
             },
@@ -604,7 +604,7 @@
         },
         {
             "name": "zombie_simple_template_upgrade_with_latest_releases",
-            "testFileDir": ["suites/rt-upgrade-templates-zombienet"],
+            "testFileDir": ["suites/zombie_simple_template_upgrade"],
             "runScripts": [
                 "download-latest-rt-binaries.sh",
                 "build-spec-single-container.sh tmp container-chain-simple-node flashbox-local",
@@ -618,7 +618,7 @@
                 "rtUpgradePath": "../target/release/wbuild/container-chain-template-simple-runtime/container_chain_template_simple_runtime.compact.compressed.wasm",
                 "type": "zombie",
                 "zombieSpec": {
-                    "configPath": "./configs/zombieTemplateUpgradeSimple.json",
+                    "configPath": "./configs/zombie_simple_template_upgrade.json",
                     "disableDefaultEthProviders": true
                 }
             },
@@ -643,7 +643,7 @@
         {
             "name": "zombie_simple_template_offchain",
             "timeout": 600000,
-            "testFileDir": ["suites/zombie-offchain"],
+            "testFileDir": ["suites/zombie_simple_template_offchain"],
             "runScripts": [
                 "build-spec-dancelight-single-container.sh",
                 "compile-wasm.ts compile -b ../target/release/container-chain-simple-node -o wasm -c specs/single-container-template-container-2000.json"
@@ -651,7 +651,7 @@
             "foundation": {
                 "type": "zombie",
                 "zombieSpec": {
-                    "configPath": "./configs/zombieDancelightSingleContainer.json",
+                    "configPath": "./configs/zombie_simple_template_offchain.json",
                     "disableDefaultEthProviders": true
                 }
             },
@@ -670,7 +670,7 @@
         },
         {
             "name": "zombie_frontier_template_upgrade",
-            "testFileDir": ["suites/rt-upgrade-templates-zombienet"],
+            "testFileDir": ["suites/zombie_simple_template_upgrade"],
             "runScripts": [
                 "download-latest-rt-binaries.sh",
                 "build-spec-single-container.sh tmp container-chain-frontier-node flashbox-local",
@@ -683,7 +683,7 @@
                 "rtUpgradePath": "../target/release/wbuild/container-chain-template-frontier-runtime/container_chain_template_frontier_runtime.compact.compressed.wasm",
                 "type": "zombie",
                 "zombieSpec": {
-                    "configPath": "./configs/zombieTemplateUpgradeFrontier.json",
+                    "configPath": "./configs/zombie_frontier_template_upgrade.json",
                     "disableDefaultEthProviders": true
                 }
             },
@@ -707,7 +707,7 @@
         },
         {
             "name": "zombie_frontier_template_upgrade_with_latest_releases",
-            "testFileDir": ["suites/rt-upgrade-templates-zombienet"],
+            "testFileDir": ["suites/zombie_simple_template_upgrade"],
             "runScripts": [
                 "download-latest-rt-binaries.sh",
                 "build-spec-single-container.sh tmp container-chain-frontier-node flashbox-local",
@@ -721,7 +721,7 @@
                 "rtUpgradePath": "../target/release/wbuild/container-chain-template-frontier-runtime/container_chain_template_frontier_runtime.compact.compressed.wasm",
                 "type": "zombie",
                 "zombieSpec": {
-                    "configPath": "./configs/zombieTemplateUpgradeFrontier.json",
+                    "configPath": "./configs/zombie_frontier_template_upgrade.json",
                     "disableDefaultEthProviders": true
                 }
             },
@@ -746,7 +746,7 @@
         {
             "name": "zombie_tanssi_relay",
             "timeout": 600000,
-            "testFileDir": ["suites/zombie-tanssi-relay"],
+            "testFileDir": ["suites/zombie_tanssi_relay"],
             "runScripts": [
                 "build-spec-dancelight.sh",
                 "compile-wasm.ts compile -b ../target/release/tanssi-relay -o wasm -c specs/tanssi-relay.json",
@@ -756,7 +756,7 @@
             "foundation": {
                 "type": "zombie",
                 "zombieSpec": {
-                    "configPath": "./configs/zombieDancelight.json",
+                    "configPath": "./configs/zombie_tanssi_relay.json",
                     "skipBlockCheck": ["Container2002"]
                 }
             },
@@ -797,12 +797,12 @@
             "name": "zombie_tanssi_relay_eth_bridge",
             "timeout": 600000,
             "envVars": ["RUST_BACKTRACE=1"],
-            "testFileDir": ["suites/zombie-tanssi-relay-eth-bridge"],
+            "testFileDir": ["suites/zombie_tanssi_relay_eth_bridge"],
             "runScripts": ["bridge-build-artifacts.sh"],
             "foundation": {
                 "type": "zombie",
                 "zombieSpec": {
-                    "configPath": "./configs/zombieDancelightBridge.json",
+                    "configPath": "./configs/zombie_tanssi_relay_eth_bridge.json",
                     "skipBlockCheck": ["Tanssi-relay"]
                 }
             },
@@ -816,7 +816,7 @@
         },
         {
             "name": "zombie_data_preservers",
-            "testFileDir": ["suites/data-preservers"],
+            "testFileDir": ["suites/zombie_data_preservers"],
             "runScripts": [
                 "build-spec-data-preservers.sh",
                 "download-polkadot.sh",
@@ -828,7 +828,7 @@
             "foundation": {
                 "type": "zombie",
                 "zombieSpec": {
-                    "configPath": "./configs/zombieDataPreservers.json",
+                    "configPath": "./configs/zombie_data_preservers.json",
                     "skipBlockCheck": ["DataPreserver-2000", "DataPreserver-2001"]
                 }
             },
@@ -1080,7 +1080,7 @@
         {
             "name": "zombie_tanssi_relay_unneeded_para",
             "timeout": 600000,
-            "testFileDir": ["suites/zombie-tanssi-relay-unneeded-para"],
+            "testFileDir": ["suites/zombie_tanssi_relay_unneeded_para"],
             "runScripts": [
                 "build-spec-dancelight.sh",
                 "compile-wasm.ts compile -b ../target/release/tanssi-relay -o wasm -c specs/tanssi-relay.json",
@@ -1090,7 +1090,7 @@
             "foundation": {
                 "type": "zombie",
                 "zombieSpec": {
-                    "configPath": "./configs/zombieDancelightUnneededPara.json",
+                    "configPath": "./configs/zombie_tanssi_relay_unneeded_para.json",
                     "skipBlockCheck": ["Container2002"]
                 }
             },
diff --git a/test/suites/rt-upgrade-parachain-zombienet/test-upgrade-chain.ts b/test/suites/zombie_dancebox_upgrade/test_zombie_dancebox_upgrade.ts
similarity index 100%
rename from test/suites/rt-upgrade-parachain-zombienet/test-upgrade-chain.ts
rename to test/suites/zombie_dancebox_upgrade/test_zombie_dancebox_upgrade.ts
diff --git a/test/suites/rt-upgrade-relay-zombienet/test-upgrade-chain.ts b/test/suites/zombie_dancelight_upgrade/test_zombie_dancelight_upgrade.ts
similarity index 100%
rename from test/suites/rt-upgrade-relay-zombienet/test-upgrade-chain.ts
rename to test/suites/zombie_dancelight_upgrade/test_zombie_dancelight_upgrade.ts
diff --git a/test/suites/data-preservers/test_data_preservers.ts b/test/suites/zombie_data_preservers/test_zombie_data_preservers.ts
similarity index 100%
rename from test/suites/data-preservers/test_data_preservers.ts
rename to test/suites/zombie_data_preservers/test_zombie_data_preservers.ts
diff --git a/test/suites/zombie-offchain/test-simple-template-offchain.ts b/test/suites/zombie_simple_template_offchain/test_zombie_simple_template_offchain.ts
similarity index 100%
rename from test/suites/zombie-offchain/test-simple-template-offchain.ts
rename to test/suites/zombie_simple_template_offchain/test_zombie_simple_template_offchain.ts
diff --git a/test/suites/rt-upgrade-templates-zombienet/test-upgrade-chain.ts b/test/suites/zombie_simple_template_upgrade/test_zombie_simple_template_upgrade.ts
similarity index 100%
rename from test/suites/rt-upgrade-templates-zombienet/test-upgrade-chain.ts
rename to test/suites/zombie_simple_template_upgrade/test_zombie_simple_template_upgrade.ts
diff --git a/test/suites/para/test_tanssi_containers.ts b/test/suites/zombie_tanssi/test_zombie_tanssi.ts
similarity index 100%
rename from test/suites/para/test_tanssi_containers.ts
rename to test/suites/zombie_tanssi/test_zombie_tanssi.ts
diff --git a/test/suites/keep-db/test_restart_keep_db.ts b/test/suites/zombie_tanssi_keep_db/test_zombie_tanssi_keep_db.ts
similarity index 100%
rename from test/suites/keep-db/test_restart_keep_db.ts
rename to test/suites/zombie_tanssi_keep_db/test_zombie_tanssi_keep_db.ts
diff --git a/test/suites/metrics/test_metrics_stop.ts b/test/suites/zombie_tanssi_metrics/test_zombie_tanssi_metrics.ts
similarity index 100%
rename from test/suites/metrics/test_metrics_stop.ts
rename to test/suites/zombie_tanssi_metrics/test_zombie_tanssi_metrics.ts
diff --git a/test/suites/one-node/test_tanssi_one_node.ts b/test/suites/zombie_tanssi_one_node/test_zombie_tanssi_one_node.ts
similarity index 100%
rename from test/suites/one-node/test_tanssi_one_node.ts
rename to test/suites/zombie_tanssi_one_node/test_zombie_tanssi_one_node.ts
diff --git a/test/suites/parathreads/test_tanssi_parathreads.ts b/test/suites/zombie_tanssi_parathreads/test_zombie_tanssi_parathreads.ts
similarity index 100%
rename from test/suites/parathreads/test_tanssi_parathreads.ts
rename to test/suites/zombie_tanssi_parathreads/test_zombie_tanssi_parathreads.ts
diff --git a/test/suites/zombie-tanssi-relay/test-tanssi-relay.ts b/test/suites/zombie_tanssi_relay/test_zombie_tanssi_relay.ts
similarity index 100%
rename from test/suites/zombie-tanssi-relay/test-tanssi-relay.ts
rename to test/suites/zombie_tanssi_relay/test_zombie_tanssi_relay.ts
diff --git a/test/suites/zombie-tanssi-relay-eth-bridge/test-consensus-bridge.ts b/test/suites/zombie_tanssi_relay_eth_bridge/test_zombie_tanssi_relay_eth_bridge.ts
similarity index 100%
rename from test/suites/zombie-tanssi-relay-eth-bridge/test-consensus-bridge.ts
rename to test/suites/zombie_tanssi_relay_eth_bridge/test_zombie_tanssi_relay_eth_bridge.ts
diff --git a/test/suites/zombie-tanssi-relay-unneeded-para/test-tanssi-relay-unneeded-para.ts b/test/suites/zombie_tanssi_relay_unneeded_para/test_zombie_tanssi_relay_unneeded_para.ts
similarity index 100%
rename from test/suites/zombie-tanssi-relay-unneeded-para/test-tanssi-relay-unneeded-para.ts
rename to test/suites/zombie_tanssi_relay_unneeded_para/test_zombie_tanssi_relay_unneeded_para.ts
diff --git a/test/suites/rotation-para/test_rotation.ts b/test/suites/zombie_tanssi_rotation/test_zombie_tanssi_rotation.ts
similarity index 100%
rename from test/suites/rotation-para/test_rotation.ts
rename to test/suites/zombie_tanssi_rotation/test_zombie_tanssi_rotation.ts
diff --git a/test/suites/warp-sync/test_warp_sync.ts b/test/suites/zombie_tanssi_warp_sync/test_zombie_tanssi_warp_sync.ts
similarity index 100%
rename from test/suites/warp-sync/test_warp_sync.ts
rename to test/suites/zombie_tanssi_warp_sync/test_zombie_tanssi_warp_sync.ts