diff --git a/.github/workflows/ci-release.yml b/.github/workflows/ci-release.yml
index 405ac3cc..6143296a 100644
--- a/.github/workflows/ci-release.yml
+++ b/.github/workflows/ci-release.yml
@@ -67,7 +67,7 @@ jobs:
           check_id: ${{ steps.check.outputs.check_id }}
 
   test-all:
-    name: Test All - ${{ matrix.platform.name }} - Node ${{ matrix.node-version }}
+    name: Test All - ${{ matrix.platform.name }} - ${{ matrix.node-version }}
     if: github.repository_owner == 'npm'
     strategy:
       fail-fast: false
@@ -101,7 +101,7 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           status: in_progress
-          name: Test All - ${{ matrix.platform.name }} - Node ${{ matrix.node-version }}
+          name: Test All - ${{ matrix.platform.name }} - ${{ matrix.node-version }}
           sha: ${{ inputs.check-sha }}
           # XXX: this does not work when using the default GITHUB_TOKEN.
           # Instead we post the main job url to the PR as a comment which
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 16f8f014..7043ab9e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -44,7 +44,7 @@ jobs:
         run: npm run postlint --ignore-scripts
 
   test:
-    name: Test All - ${{ matrix.platform.name }} - Node ${{ matrix.node-version }}
+    name: Test - ${{ matrix.platform.name }} - ${{ matrix.node-version }}
     if: github.repository_owner == 'npm'
     strategy:
       fail-fast: false
diff --git a/lib/content/_job-matrix.yml b/lib/content/_job-matrix.yml
index 66ec5415..8d77a5c2 100644
--- a/lib/content/_job-matrix.yml
+++ b/lib/content/_job-matrix.yml
@@ -1,4 +1,4 @@
-name: {{ jobName }}
+name: {{ jobName }} - $\{{ matrix.platform.name }} - $\{{ matrix.node-version }}
 if: github.repository_owner == 'npm'
 strategy:
   fail-fast: false
@@ -26,4 +26,4 @@ defaults:
   run:
     shell: $\{{ matrix.platform.shell }}
 steps:
-  {{> stepsSetup jobNodeMatrix=true }}
+  {{> stepsSetup jobIsMatrix=true }}
diff --git a/lib/content/_step-checks.yml b/lib/content/_step-checks.yml
index f38e78e8..ef89381a 100644
--- a/lib/content/_step-checks.yml
+++ b/lib/content/_step-checks.yml
@@ -10,7 +10,7 @@
     token: $\{{ secrets.GITHUB_TOKEN }}
     {{#if jobCheck.sha}}
     status: {{#if jobCheck.status}}{{ jobCheck.status }}{{else}}in_progress{{/if}} 
-    name: {{#if jobCheck.name}}{{ jobCheck.name }}{{else}}{{ jobName }}{{/if}}
+    name: {{#if jobCheck.name}}{{ jobCheck.name }}{{else}}{{ jobName }}{{/if}}{{#if jobIsMatrix}} - $\{{ matrix.platform.name }} - $\{{ matrix.node-version }}{{/if}}
     sha: {{ jobCheck.sha }}
     # XXX: this does not work when using the default GITHUB_TOKEN.
     # Instead we post the main job url to the PR as a comment which
diff --git a/lib/content/_step-node.yml b/lib/content/_step-node.yml
index bb27e6b9..4cbac095 100644
--- a/lib/content/_step-node.yml
+++ b/lib/content/_step-node.yml
@@ -1,12 +1,12 @@
 - name: Setup Node
   uses: actions/setup-node@v3
   with:
-    node-version: {{#if jobNodeMatrix}}$\{{ matrix.node-version }}{{else}}{{ last ciVersions }}{{/if}}
+    node-version: {{#if jobIsMatrix}}$\{{ matrix.node-version }}{{else}}{{ last ciVersions }}{{/if}}
     {{#if lockfile}}
     cache: npm
     {{/if}}
 {{#if updateNpm}}
-{{#if jobNodeMatrix}}
+{{#if jobIsMatrix}}
 - name: Update Windows npm
   # node 12 and 14 ship with npm@6, which is known to fail when updating itself in windows
   if: matrix.platform.os == 'windows-latest' && (startsWith(matrix.node-version, '12.') || startsWith(matrix.node-version, '14.'))
diff --git a/lib/content/ci-release.yml b/lib/content/ci-release.yml
index 7b83bd11..53afd4c6 100644
--- a/lib/content/ci-release.yml
+++ b/lib/content/ci-release.yml
@@ -23,7 +23,7 @@ jobs:
 
   test-all:
     {{> jobMatrix
-      jobName="Test All - ${{ matrix.platform.name }} - Node ${{ matrix.node-version }}"
+      jobName="Test All"
       jobCheck=(obj sha="${{ inputs.check-sha }}")
       jobCheckout=(obj ref="${{ inputs.ref }}")
     }}
diff --git a/lib/content/ci.yml b/lib/content/ci.yml
index feff29f1..0226d0c3 100644
--- a/lib/content/ci.yml
+++ b/lib/content/ci.yml
@@ -9,5 +9,5 @@ jobs:
       {{> stepLint jobRunFlags=pkgFlags }}
 
   test:
-    {{> jobMatrix jobName="Test All - ${{ matrix.platform.name }} - Node ${{ matrix.node-version }}" }}
+    {{> jobMatrix jobName="Test" }}
       {{> stepTest jobRunFlags=pkgFlags }}
diff --git a/tap-snapshots/test/apply/source-snapshots.js.test.cjs b/tap-snapshots/test/apply/source-snapshots.js.test.cjs
index d44a27cb..2f578df1 100644
--- a/tap-snapshots/test/apply/source-snapshots.js.test.cjs
+++ b/tap-snapshots/test/apply/source-snapshots.js.test.cjs
@@ -274,7 +274,7 @@ jobs:
           check_id: \${{ steps.check.outputs.check_id }}
 
   test-all:
-    name: Test All - \${{ matrix.platform.name }} - Node \${{ matrix.node-version }}
+    name: Test All - \${{ matrix.platform.name }} - \${{ matrix.node-version }}
     if: github.repository_owner == 'npm'
     strategy:
       fail-fast: false
@@ -308,7 +308,7 @@ jobs:
         with:
           token: \${{ secrets.GITHUB_TOKEN }}
           status: in_progress
-          name: Test All - \${{ matrix.platform.name }} - Node \${{ matrix.node-version }}
+          name: Test All - \${{ matrix.platform.name }} - \${{ matrix.node-version }}
           sha: \${{ inputs.check-sha }}
           # XXX: this does not work when using the default GITHUB_TOKEN.
           # Instead we post the main job url to the PR as a comment which
@@ -408,7 +408,7 @@ jobs:
         run: npm run postlint --ignore-scripts
 
   test:
-    name: Test All - \${{ matrix.platform.name }} - Node \${{ matrix.node-version }}
+    name: Test - \${{ matrix.platform.name }} - \${{ matrix.node-version }}
     if: github.repository_owner == 'npm'
     strategy:
       fail-fast: false
@@ -1322,7 +1322,7 @@ jobs:
         run: npm run postlint --ignore-scripts
 
   test:
-    name: Test All - \${{ matrix.platform.name }} - Node \${{ matrix.node-version }}
+    name: Test - \${{ matrix.platform.name }} - \${{ matrix.node-version }}
     if: github.repository_owner == 'npm'
     strategy:
       fail-fast: false
@@ -1436,7 +1436,7 @@ jobs:
         run: npm run postlint --ignore-scripts
 
   test:
-    name: Test All - \${{ matrix.platform.name }} - Node \${{ matrix.node-version }}
+    name: Test - \${{ matrix.platform.name }} - \${{ matrix.node-version }}
     if: github.repository_owner == 'npm'
     strategy:
       fail-fast: false
@@ -1569,7 +1569,7 @@ jobs:
           check_id: \${{ steps.check.outputs.check_id }}
 
   test-all:
-    name: Test All - \${{ matrix.platform.name }} - Node \${{ matrix.node-version }}
+    name: Test All - \${{ matrix.platform.name }} - \${{ matrix.node-version }}
     if: github.repository_owner == 'npm'
     strategy:
       fail-fast: false
@@ -1603,7 +1603,7 @@ jobs:
         with:
           token: \${{ secrets.GITHUB_TOKEN }}
           status: in_progress
-          name: Test All - \${{ matrix.platform.name }} - Node \${{ matrix.node-version }}
+          name: Test All - \${{ matrix.platform.name }} - \${{ matrix.node-version }}
           sha: \${{ inputs.check-sha }}
           # XXX: this does not work when using the default GITHUB_TOKEN.
           # Instead we post the main job url to the PR as a comment which
@@ -1705,7 +1705,7 @@ jobs:
         run: npm run postlint --ignore-scripts
 
   test:
-    name: Test All - \${{ matrix.platform.name }} - Node \${{ matrix.node-version }}
+    name: Test - \${{ matrix.platform.name }} - \${{ matrix.node-version }}
     if: github.repository_owner == 'npm'
     strategy:
       fail-fast: false
@@ -2621,7 +2621,7 @@ jobs:
         run: npm run postlint --ignore-scripts
 
   test:
-    name: Test All - \${{ matrix.platform.name }} - Node \${{ matrix.node-version }}
+    name: Test - \${{ matrix.platform.name }} - \${{ matrix.node-version }}
     if: github.repository_owner == 'npm'
     strategy:
       fail-fast: false
@@ -2735,7 +2735,7 @@ jobs:
         run: npm run postlint --ignore-scripts
 
   test:
-    name: Test All - \${{ matrix.platform.name }} - Node \${{ matrix.node-version }}
+    name: Test - \${{ matrix.platform.name }} - \${{ matrix.node-version }}
     if: github.repository_owner == 'npm'
     strategy:
       fail-fast: false
@@ -2868,7 +2868,7 @@ jobs:
           check_id: \${{ steps.check.outputs.check_id }}
 
   test-all:
-    name: Test All - \${{ matrix.platform.name }} - Node \${{ matrix.node-version }}
+    name: Test All - \${{ matrix.platform.name }} - \${{ matrix.node-version }}
     if: github.repository_owner == 'npm'
     strategy:
       fail-fast: false
@@ -2902,7 +2902,7 @@ jobs:
         with:
           token: \${{ secrets.GITHUB_TOKEN }}
           status: in_progress
-          name: Test All - \${{ matrix.platform.name }} - Node \${{ matrix.node-version }}
+          name: Test All - \${{ matrix.platform.name }} - \${{ matrix.node-version }}
           sha: \${{ inputs.check-sha }}
           # XXX: this does not work when using the default GITHUB_TOKEN.
           # Instead we post the main job url to the PR as a comment which