diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 80057cb..26a56ee 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -4,51 +4,51 @@ on: pull_request
 
 jobs:
   build:
-    name: ${{ matrix.flavor.name }} / ${{ matrix.build.os_name }} (${{ matrix.build.compiler_name }})
+    name: ${{ matrix.flavor.name }} / ${{ matrix.build.system_name }} / ${{ matrix.build.build_type }} / ${{ matrix.build.compiler_name }}
     runs-on: ${{ matrix.build.os }}
 
     strategy:
       fail-fast: false
       matrix:
-        build:
-          - os_name: Ubuntu Latest
-            compiler_name: GCC
-            os: ubuntu-latest
-            build_type: Debug
-            test_path: StormTest
-            cc: gcc
-            cxx: g++
-
-          - os_name: macOS Latest
-            compiler_name: Clang
-            os: macos-latest
-            build_type: Debug
-            test_path: StormTest
-            cc: clang
-            cxx: clang++
-
-          - os_name: Windows Latest
-            compiler_name: MSVC
-            os: windows-latest
-            build_type: Debug
-            test_path: Debug/StormTest
-            cc: cl
-            cxx: cl
-
         flavor:
           - name: WoW
             define: WOW
           - name: SC1
             define: SC1
 
+        build:
+          - system_name: Linux
+            build_type: Debug
+            compiler_name: GCC
+            test_path: StormTest
+            os: ubuntu-latest
+            cc: gcc
+            cxx: g++
+
+          - system_name: macOS
+            build_type: Debug
+            compiler_name: Clang
+            test_path: StormTest
+            os: macos-latest
+            cc: clang
+            cxx: clang++
+
+          - system_name: Windows
+            build_type: Debug
+            compiler_name: MSVC
+            test_path: Debug/StormTest
+            os: windows-latest
+            cc: cl
+            cxx: cl
+
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v6
         with:
           submodules: true
 
-      - name: Install Dependencies (Ubuntu)
+      - name: Install Dependencies (${{ matrix.build.os }})
         run: sudo apt install -y lcov
-        if: matrix.build.os_name == 'Ubuntu Latest'
+        if: matrix.build.os == 'ubuntu-latest'
 
       - name: Prepare
         run: mkdir build
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 534aa7f..ee762cf 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -7,45 +7,45 @@ on:
 
 jobs:
   build:
-    name: ${{ matrix.flavor.name }} / ${{ matrix.build.os_name }} (${{ matrix.build.compiler_name }})
+    name: ${{ matrix.flavor.name }} / ${{ matrix.build.system_name }} / ${{ matrix.build.build_type }} / ${{ matrix.build.compiler_name }}
     runs-on: ${{ matrix.build.os }}
 
     strategy:
       fail-fast: false
       matrix:
-        build:
-          - os_name: Ubuntu Latest
-            compiler_name: GCC
-            os: ubuntu-latest
-            build_type: Release
-            test_path: StormTest
-            cc: gcc
-            cxx: g++
-
-          - os_name: macOS Latest
-            compiler_name: Clang
-            os: macos-latest
-            build_type: Release
-            test_path: StormTest
-            cc: clang
-            cxx: clang++
-
-          - os_name: Windows Latest
-            compiler_name: MSVC
-            os: windows-latest
-            build_type: Release
-            test_path: Release/StormTest
-            cc: cl
-            cxx: cl
-
         flavor:
           - name: WoW
             define: WOW
           - name: SC1
             define: SC1
 
+        build:
+          - system_name: Linux
+            build_type: Release
+            compiler_name: GCC
+            test_path: StormTest
+            os: ubuntu-latest
+            cc: gcc
+            cxx: g++
+
+          - system_name: macOS
+            build_type: Release
+            compiler_name: Clang
+            test_path: StormTest
+            os: macos-latest
+            cc: clang
+            cxx: clang++
+
+          - system_name: Windows
+            build_type: Release
+            compiler_name: MSVC
+            test_path: Release/StormTest
+            os: windows-latest
+            cc: cl
+            cxx: cl
+
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v6
         with:
           submodules: true