diff --git a/static_core/tests/tests-u-runner-2/cfg/workflows/ark-aot-pgo.yaml b/static_core/tests/tests-u-runner-2/cfg/workflows/ark-aot-pgo.yaml
index 5bf7838f7fa4f66c0136683457d788b263c62caf..b856eceb48feb81a34a51e27b16b6ec27fa8c04d 100644
--- a/static_core/tests/tests-u-runner-2/cfg/workflows/ark-aot-pgo.yaml
+++ b/static_core/tests/tests-u-runner-2/cfg/workflows/ark-aot-pgo.yaml
@@ -43,7 +43,7 @@ parameters:
     is-panda: True
 steps:
     ark-creates-profile-for-aot-pgo:
-        from: only-runtime
+        from: ark
         ark-timeout: ${parameters.ark-timeout}
         build: ${parameters.build}
         work-dir: ${parameters.work-dir}
diff --git a/static_core/tests/tests-u-runner-2/cfg/workflows/only-ark-aot.yaml b/static_core/tests/tests-u-runner-2/cfg/workflows/ark-aot.yaml
similarity index 100%
rename from static_core/tests/tests-u-runner-2/cfg/workflows/only-ark-aot.yaml
rename to static_core/tests/tests-u-runner-2/cfg/workflows/ark-aot.yaml
diff --git a/static_core/tests/tests-u-runner-2/cfg/workflows/only-runtime.yaml b/static_core/tests/tests-u-runner-2/cfg/workflows/ark.yaml
similarity index 100%
rename from static_core/tests/tests-u-runner-2/cfg/workflows/only-runtime.yaml
rename to static_core/tests/tests-u-runner-2/cfg/workflows/ark.yaml
diff --git a/static_core/tests/tests-u-runner-2/cfg/workflows/only-es2panda.yaml b/static_core/tests/tests-u-runner-2/cfg/workflows/es2panda-verifier.yaml
similarity index 100%
rename from static_core/tests/tests-u-runner-2/cfg/workflows/only-es2panda.yaml
rename to static_core/tests/tests-u-runner-2/cfg/workflows/es2panda-verifier.yaml
diff --git a/static_core/tests/tests-u-runner-2/cfg/workflows/panda-all.yaml b/static_core/tests/tests-u-runner-2/cfg/workflows/panda-all.yaml
index 9e546b0c398c4a6dceda541a0647b6beac07735f..542813cfe5e7b41c93a932f8860dcec6c8aec7e4 100644
--- a/static_core/tests/tests-u-runner-2/cfg/workflows/panda-all.yaml
+++ b/static_core/tests/tests-u-runner-2/cfg/workflows/panda-all.yaml
@@ -53,7 +53,7 @@ parameters:
     ark-jit-args: [ ]
 steps:
     es2panda-verifier:
-        from: only-es2panda
+        from: es2panda-verifier
         opt-level: ${parameters.opt-level}
         build: ${parameters.build}
         work-dir: ${parameters.work-dir}
diff --git a/static_core/tests/tests-u-runner-2/cfg/workflows/panda-aot-pgo.yaml b/static_core/tests/tests-u-runner-2/cfg/workflows/panda-aot-pgo.yaml
index b0aa224522d1ed3173a8c2081345174a5206963c..89890627c27e8fcf8ac5c959a7b030cbdd7ece81 100644
--- a/static_core/tests/tests-u-runner-2/cfg/workflows/panda-aot-pgo.yaml
+++ b/static_core/tests/tests-u-runner-2/cfg/workflows/panda-aot-pgo.yaml
@@ -41,7 +41,7 @@ parameters:
     is-panda: True
 steps:
     compile:
-        from: only-es2panda
+        from: es2panda-verifier
         opt-level: ${parameters.opt-level}
         build: ${parameters.build}
         work-dir: ${parameters.work-dir}
@@ -64,7 +64,7 @@ steps:
         aot-timeout: ${parameters.aot-timeout}
         aot-args: ${parameters.aot-args}
     ark-after-aot-pgo:
-        from: only-runtime
+        from: ark
         ark-timeout: ${parameters.ark-timeout}
         build: ${parameters.build}
         work-dir: ${parameters.work-dir}
diff --git a/static_core/tests/tests-u-runner-2/cfg/workflows/panda-aot.yaml b/static_core/tests/tests-u-runner-2/cfg/workflows/panda-aot.yaml
index a41a0dfbc2d93d9024eb8c48b6f21aba90761f09..9ccc1fa8d736c77e4bc917463706fcce71435804 100644
--- a/static_core/tests/tests-u-runner-2/cfg/workflows/panda-aot.yaml
+++ b/static_core/tests/tests-u-runner-2/cfg/workflows/panda-aot.yaml
@@ -44,7 +44,7 @@ parameters:
     is-panda: True
 steps:
     compile:
-        from: only-es2panda
+        from: es2panda-verifier
         opt-level: ${parameters.opt-level}
         build: ${parameters.build}
         work-dir: ${parameters.work-dir}
@@ -55,7 +55,7 @@ steps:
         es2panda-timeout: ${parameters.es2panda-timeout}
         verifier-timeout: ${parameters.verifier-timeout}
     ark_aot:
-        from: only-ark-aot
+        from: ark-aot
         build: ${parameters.build}
         work-dir: ${parameters.work-dir}
         heap-verifier: ${parameters.heap-verifier}
@@ -65,7 +65,7 @@ steps:
         aot-timeout: ${parameters.aot-timeout}
         aot-args: ${parameters.aot-args}
     ark-after-aot:
-        from: only-runtime
+        from: ark
         ark-timeout: ${parameters.ark-timeout}
         build: ${parameters.build}
         work-dir: ${parameters.work-dir}
diff --git a/static_core/tests/tests-u-runner-2/cfg/workflows/panda-int.yaml b/static_core/tests/tests-u-runner-2/cfg/workflows/panda-int.yaml
index 5b4ab925a51c9a6bff19feb7fd82996f4abf3573..2dc748e9af95bc86931d7687f700c91f366be26c 100644
--- a/static_core/tests/tests-u-runner-2/cfg/workflows/panda-int.yaml
+++ b/static_core/tests/tests-u-runner-2/cfg/workflows/panda-int.yaml
@@ -39,7 +39,7 @@ parameters:
     is-panda: True
 steps:
     compile:
-        from: only-es2panda
+        from: es2panda-verifier
         opt-level: ${parameters.opt-level}
         build: ${parameters.build}
         work-dir: ${parameters.work-dir}
@@ -51,7 +51,7 @@ steps:
         verifier-timeout: ${parameters.verifier-timeout}
         es2panda-extra-args: ${parameters.es2panda-extra-args}
     runtime:
-        from: only-runtime
+        from: ark
         ark-timeout: ${parameters.ark-timeout}
         build: ${parameters.build}
         work-dir: ${parameters.work-dir}
diff --git a/static_core/tests/tests-u-runner-2/cfg/workflows/panda-jit.yaml b/static_core/tests/tests-u-runner-2/cfg/workflows/panda-jit.yaml
index fe3c37624b0d566a1f955ea66adde11bf4d2e9c0..1b80d39311d752a1851ecad4f6732a1226b9ac19 100644
--- a/static_core/tests/tests-u-runner-2/cfg/workflows/panda-jit.yaml
+++ b/static_core/tests/tests-u-runner-2/cfg/workflows/panda-jit.yaml
@@ -44,7 +44,7 @@ parameters:
     is-panda: True
 steps:
     compile:
-        from: only-es2panda
+        from: es2panda-verifier
         opt-level: ${parameters.opt-level}
         build: ${parameters.build}
         work-dir: ${parameters.work-dir}
@@ -55,7 +55,7 @@ steps:
         es2panda-timeout: ${parameters.es2panda-timeout}
         verifier-timeout: ${parameters.verifier-timeout}
     ark-with-jit:
-        from: only-runtime
+        from: ark
         ark-timeout: ${parameters.ark-timeout}
         build: ${parameters.build}
         work-dir: ${parameters.work-dir}