diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index d532e51..515d653 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -4,34 +4,34 @@ on: [pull_request]
 
 jobs:
   build:
-    name: ${{ matrix.build.os_name }} (${{ matrix.build.compiler_name }})
+    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
+          - system_name: Linux
             build_type: Debug
+            compiler_name: GCC
             test_path: WhoaTest
+            os: ubuntu-latest
             cc: gcc
             cxx: g++
 
-          - os_name: macOS Latest
-            compiler_name: Clang
-            os: macos-latest
+          - system_name: macOS
             build_type: Debug
+            compiler_name: Clang
             test_path: WhoaTest
+            os: macos-latest
             cc: clang
             cxx: clang++
 
-          - os_name: Windows Latest
-            compiler_name: MSVC
-            os: windows-latest
+          - system_name: Windows
             build_type: Debug
+            compiler_name: MSVC
             test_path: WhoaTest
+            os: windows-latest
             cc: cl
             cxx: cl
 
@@ -40,9 +40,9 @@ jobs:
         with:
           submodules: recursive
 
-      - 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: Download Fixtures
         run: aws s3 cp --endpoint-url ${{ env.AWS_ENDPOINT_URL }} s3://reliquaryhq-whoa/fixture.tgz  test/fixture/
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index e3a3959..981bae5 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -7,34 +7,34 @@ on:
 
 jobs:
   build:
-    name: ${{ matrix.build.os_name }} (${{ matrix.build.compiler_name }})
+    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
+          - system_name: Linux
             build_type: Release
+            compiler_name: GCC
             test_path: WhoaTest
+            os: ubuntu-latest
             cc: gcc
             cxx: g++
 
-          - os_name: macOS Latest
-            compiler_name: Clang
-            os: macos-latest
+          - system_name: macOS
             build_type: Release
+            compiler_name: Clang
             test_path: WhoaTest
+            os: macos-latest
             cc: clang
             cxx: clang++
 
-          - os_name: Windows Latest
-            compiler_name: MSVC
-            os: windows-latest
+          - system_name: Windows
             build_type: Release
+            compiler_name: MSVC
             test_path: WhoaTest
+            os: windows-latest
             cc: cl
             cxx: cl