diff --git a/.github/workflows/shared-test-integration.yml b/.github/workflows/shared-test-integration.yml
index 81f194f9550..4c7d6209dfa 100644
--- a/.github/workflows/shared-test-integration.yml
+++ b/.github/workflows/shared-test-integration.yml
@@ -25,7 +25,7 @@ env:
 
 jobs:
   integration:
-    name: '👀 Integration Test: (OS: "${{ inputs.os }}" Node: "${{ matrix.node }}" Browser: "${{ matrix.browser }}")'
+    name: '👀 Test (${{ inputs.os }}/node@${{ matrix.node }}/${{ matrix.browser }})'
     strategy:
       fail-fast: false
       matrix:
diff --git a/.github/workflows/shared-test-unit.yml b/.github/workflows/shared-test-unit.yml
index db468f0fe0d..eab5d266ef8 100644
--- a/.github/workflows/shared-test-unit.yml
+++ b/.github/workflows/shared-test-unit.yml
@@ -19,7 +19,7 @@ env:
 
 jobs:
   test:
-    name: "🧪 Test: (OS: ${{ inputs.os }} Node: ${{ matrix.node }})"
+    name: '🧪 Test (${{ inputs.os }}/node@${{ matrix.node }})'
     strategy:
       fail-fast: false
       matrix:
diff --git a/.github/workflows/test-full.yml b/.github/workflows/test-full.yml
index 71674cb1c00..d1de185756e 100644
--- a/.github/workflows/test-full.yml
+++ b/.github/workflows/test-full.yml
@@ -1,4 +1,4 @@
-name: 🧪 Test
+name: Branch
 
 # main/dev branches will get the full run across all OS/browsers
 
@@ -18,14 +18,14 @@ jobs:
     if: github.repository == 'remix-run/remix'
     uses: ./.github/workflows/shared-build.yml
 
-  test-unit:
+  unit:
     if: github.repository == 'remix-run/remix'
     uses: ./.github/workflows/shared-test-unit.yml
     with:
       os: '["ubuntu-latest", "windows-latest"]'
       node_version: '["latest"]'
 
-  test-integration-ubuntu:
+  ubuntu:
     if: github.repository == 'remix-run/remix'
     uses: ./.github/workflows/shared-test-integration.yml
     with:
@@ -33,7 +33,7 @@ jobs:
       node_version: '["latest"]'
       browser: '["chromium", "firefox"]'
 
-  test-integration-windows:
+  windows:
     if: github.repository == 'remix-run/remix'
     uses: ./.github/workflows/shared-test-integration.yml
     with:
@@ -41,7 +41,7 @@ jobs:
       node_version: '["latest"]'
       browser: '["edge"]'
 
-  test-integration-macos:
+  macos:
     if: github.repository == 'remix-run/remix'
     uses: ./.github/workflows/shared-test-integration.yml
     with:
diff --git a/.github/workflows/test-pr-ubuntu.yml b/.github/workflows/test-pr-ubuntu.yml
index 05d5e02631c..3a5940f9c0a 100644
--- a/.github/workflows/test-pr-ubuntu.yml
+++ b/.github/workflows/test-pr-ubuntu.yml
@@ -1,4 +1,4 @@
-name: 🧪 Test (PR) (Ubuntu)
+name: PR (Base)
 
 # All PRs touching code will run tests on ubuntu/node/chromium
 
@@ -15,14 +15,14 @@ jobs:
     if: github.repository == 'remix-run/remix'
     uses: ./.github/workflows/shared-build.yml
 
-  test-unit-ubuntu:
+  unit:
     if: github.repository == 'remix-run/remix'
     uses: ./.github/workflows/shared-test-unit.yml
     with:
       os: "ubuntu-latest"
       node_version: '["latest"]'
 
-  test-integration-ubuntu-chromium:
+  integration:
     if: github.repository == 'remix-run/remix'
     uses: ./.github/workflows/shared-test-integration.yml
     with:
diff --git a/.github/workflows/test-pr-windows-macos.yml b/.github/workflows/test-pr-windows-macos.yml
index 939c975d971..455cbd2b598 100644
--- a/.github/workflows/test-pr-windows-macos.yml
+++ b/.github/workflows/test-pr-windows-macos.yml
@@ -1,4 +1,4 @@
-name: 🧪 Test (PR) (Windows, MacOS)
+name: PR (Full)
 
 # PRs touching create-remix/remix-dev will also run on Windows and OSX
 
@@ -10,14 +10,14 @@ on:
       - "!**/*.md"
 
 jobs:
-  test-unit-windows:
+  unit-windows:
     if: github.repository == 'remix-run/remix'
     uses: ./.github/workflows/shared-test-unit.yml
     with:
       os: "windows-latest"
       node_version: '["latest"]'
 
-  test-integration-ubuntu-firefox:
+  integration-firefox:
     if: github.repository == 'remix-run/remix'
     uses: ./.github/workflows/shared-test-integration.yml
     with:
@@ -25,7 +25,7 @@ jobs:
       node_version: '["latest"]'
       browser: '["firefox"]'
 
-  test-integration-windows:
+  integration-windows:
     if: github.repository == 'remix-run/remix'
     uses: ./.github/workflows/shared-test-integration.yml
     with:
@@ -33,7 +33,7 @@ jobs:
       node_version: '["latest"]'
       browser: '["edge"]'
 
-  test-integration-macos:
+  integration-macos:
     if: github.repository == 'remix-run/remix'
     uses: ./.github/workflows/shared-test-integration.yml
     with: