diff --git a/.github/workflows/sycl_resolve_test_matrix.yml b/.github/workflows/sycl_gen_test_matrix.yml
similarity index 91%
rename from .github/workflows/sycl_resolve_test_matrix.yml
rename to .github/workflows/sycl_gen_test_matrix.yml
index 46cfbc3dbc864..dc80bd1ae67b9 100644
--- a/.github/workflows/sycl_resolve_test_matrix.yml
+++ b/.github/workflows/sycl_gen_test_matrix.yml
@@ -27,13 +27,13 @@ on:
     outputs:
       lts_matrix:
         description: "Generated Matrix"
-        value: ${{ jobs.resolve_matrix.outputs.lts_matrix }}
+        value: ${{ jobs.test_matrix.outputs.lts_matrix }}
       lts_aws_matrix:
         description: "Generated Matrix AWS subset"
-        value: ${{ jobs.resolve_matrix.outputs.lts_aws_matrix }}
+        value: ${{ jobs.test_matrix.outputs.lts_aws_matrix }}
 jobs:
-  resolve_matrix:
-    name: Resolve Test Matrix
+  test_matrix:
+    name: Generate Test Matrix
     runs-on: ubuntu-latest
     outputs:
       lts_matrix: ${{ steps.work.outputs.lts_matrix }}
diff --git a/.github/workflows/sycl_nightly.yml b/.github/workflows/sycl_nightly.yml
index 9299ac11ad490..1e2880134113e 100644
--- a/.github/workflows/sycl_nightly.yml
+++ b/.github/workflows/sycl_nightly.yml
@@ -10,16 +10,16 @@ on:
       - '.github/workflows/sycl_nightly.yml'
 
 jobs:
-  resolve_matrix:
-    name: Resolve Test Matrix
-    uses: ./.github/workflows/sycl_resolve_test_matrix.yml
+  test_matrix:
+    name: Generate Test Matrix
+    uses: ./.github/workflows/sycl_gen_test_matrix.yml
     with:
       lts_config: "ocl_gen9;ocl_x64"
 
   ubuntu2004_build_test:
     if: github.repository == 'intel/llvm'
     uses: ./.github/workflows/sycl_linux_build_and_test.yml
-    needs: resolve_matrix
+    needs: test_matrix
     secrets: inherit
     with:
       build_cache_root: "/__w/"
@@ -29,7 +29,7 @@ jobs:
   ubuntu2004_opaque_pointers_build_test:
     if: github.repository == 'intel/llvm'
     uses: ./.github/workflows/sycl_linux_build_and_test.yml
-    needs: resolve_matrix
+    needs: test_matrix
     secrets: inherit
     with:
       build_cache_root: "/__w/"
diff --git a/.github/workflows/sycl_post_commit.yml b/.github/workflows/sycl_post_commit.yml
index cef878bb8331d..0ac9490e7bdf2 100644
--- a/.github/workflows/sycl_post_commit.yml
+++ b/.github/workflows/sycl_post_commit.yml
@@ -12,21 +12,21 @@ on:
 
 jobs:
   # This job generates matrix of tests for LLVM Test Suite
-  resolve_matrix:
-    name: Resolve Test Matrix
-    uses: ./.github/workflows/sycl_resolve_test_matrix.yml
+  test_matrix:
+    name: Generate Test Matrix
+    uses: ./.github/workflows/sycl_gen_test_matrix.yml
     with:
       lts_config: "l0_gen9"
   linux_default:
     name: Linux Default
-    needs: resolve_matrix
+    needs: test_matrix
     uses: ./.github/workflows/sycl_linux_build_and_test.yml
     secrets: inherit
     with:
       build_cache_root: "/__w/llvm"
       build_artifact_suffix: "post_commit"
-      lts_matrix: ${{ needs.resolve_matrix.outputs.lts_matrix }}
-      lts_aws_matrix: ${{ needs.resolve_matrix.outputs.lts_aws_matrix }}
+      lts_matrix: ${{ needs.test_matrix.outputs.lts_matrix }}
+      lts_aws_matrix: ${{ needs.test_matrix.outputs.lts_aws_matrix }}
   linux_no_assert:
     name: Linux (no assert)
     uses: ./.github/workflows/sycl_linux_build_and_test.yml
diff --git a/.github/workflows/sycl_precommit.yml b/.github/workflows/sycl_precommit.yml
index df8ea5f851bb3..f306b2c0e93e3 100644
--- a/.github/workflows/sycl_precommit.yml
+++ b/.github/workflows/sycl_precommit.yml
@@ -35,9 +35,9 @@ jobs:
       uses: ./devops/actions/clang-format
 
   # This job generates matrix of tests for LLVM Test Suite
-  resolve_matrix:
-    name: Resolve Test Matrix
-    uses: ./.github/workflows/sycl_resolve_test_matrix.yml
+  test_matrix:
+    name: Generate Test Matrix
+    uses: ./.github/workflows/sycl_gen_test_matrix.yml
     with:
       lts_config: "hip_amdgpu;ocl_x64;ocl_gen9;l0_gen9;esimd_emu;cuda"
 
@@ -45,7 +45,7 @@ jobs:
     name: Linux
     # Only build and test patches, that have passed all linter checks, because
     # the next commit is likely to be a follow-up on that job.
-    needs: [lint, resolve_matrix]
+    needs: [lint, test_matrix]
     if: always() && (success() || contains(github.event.pull_request.labels.*.name, 'ignore-lint'))
     uses: ./.github/workflows/sycl_linux_build_and_test.yml
     secrets: inherit
@@ -55,5 +55,5 @@ jobs:
       build_cache_size: "8G"
       build_artifact_suffix: "default"
       build_cache_suffix: "default"
-      lts_matrix: ${{ needs.resolve_matrix.outputs.lts_matrix }}
-      lts_aws_matrix: ${{ needs.resolve_matrix.outputs.lts_aws_matrix }}
+      lts_matrix: ${{ needs.test_matrix.outputs.lts_matrix }}
+      lts_aws_matrix: ${{ needs.test_matrix.outputs.lts_aws_matrix }}