diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index cad064ad2a8..12fd528aa8f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -590,9 +590,9 @@ jobs:
       nox-archive-hash: "${{ needs.prepare-workflow.outputs.nox-archive-hash }}"
       kind: windows
 
-  rockylinux-8-pkg-tests:
+  test-pkg-rockylinux-8:
     name: Rocky Linux 8 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['rockylinux-8-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-rockylinux-8'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -612,9 +612,9 @@ jobs:
       skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  rockylinux-8-arm64-pkg-tests:
+  test-pkg-rockylinux-8-arm64:
     name: Rocky Linux 8 Arm64 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['rockylinux-8-arm64-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-rockylinux-8-arm64'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -634,9 +634,9 @@ jobs:
       skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  rockylinux-9-pkg-tests:
+  test-pkg-rockylinux-9:
     name: Rocky Linux 9 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['rockylinux-9-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-rockylinux-9'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -656,9 +656,9 @@ jobs:
       skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  rockylinux-9-arm64-pkg-tests:
+  test-pkg-rockylinux-9-arm64:
     name: Rocky Linux 9 Arm64 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['rockylinux-9-arm64-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-rockylinux-9-arm64'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -678,9 +678,9 @@ jobs:
       skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  amazonlinux-2-pkg-tests:
+  test-pkg-amazonlinux-2:
     name: Amazon Linux 2 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['amazonlinux-2-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-amazonlinux-2'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -700,9 +700,9 @@ jobs:
       skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  amazonlinux-2-arm64-pkg-tests:
+  test-pkg-amazonlinux-2-arm64:
     name: Amazon Linux 2 Arm64 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['amazonlinux-2-arm64-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-amazonlinux-2-arm64'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -722,9 +722,9 @@ jobs:
       skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  amazonlinux-2023-pkg-tests:
+  test-pkg-amazonlinux-2023:
     name: Amazon Linux 2023 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['amazonlinux-2023-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-amazonlinux-2023'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -744,9 +744,9 @@ jobs:
       skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  amazonlinux-2023-arm64-pkg-tests:
+  test-pkg-amazonlinux-2023-arm64:
     name: Amazon Linux 2023 Arm64 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['amazonlinux-2023-arm64-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-amazonlinux-2023-arm64'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -766,9 +766,9 @@ jobs:
       skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  debian-11-pkg-tests:
+  test-pkg-debian-11:
     name: Debian 11 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['debian-11-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-debian-11'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -788,9 +788,9 @@ jobs:
       skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  debian-11-arm64-pkg-tests:
+  test-pkg-debian-11-arm64:
     name: Debian 11 Arm64 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['debian-11-arm64-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-debian-11-arm64'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -810,9 +810,9 @@ jobs:
       skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  debian-12-pkg-tests:
+  test-pkg-debian-12:
     name: Debian 12 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['debian-12-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-debian-12'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -832,9 +832,9 @@ jobs:
       skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  debian-12-arm64-pkg-tests:
+  test-pkg-debian-12-arm64:
     name: Debian 12 Arm64 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['debian-12-arm64-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-debian-12-arm64'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -854,9 +854,9 @@ jobs:
       skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  photonos-4-pkg-tests:
+  test-pkg-photonos-4:
     name: Photon OS 4 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['photonos-4-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-photonos-4'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -876,9 +876,9 @@ jobs:
       skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  photonos-4-arm64-pkg-tests:
+  test-pkg-photonos-4-arm64:
     name: Photon OS 4 Arm64 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['photonos-4-arm64-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-photonos-4-arm64'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -898,9 +898,9 @@ jobs:
       skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  photonos-4-pkg-tests-fips:
+  test-pkg-photonos-4-fips:
     name: Photon OS 4 Package Test (fips)
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['photonos-4-pkg-tests-fips'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-photonos-4-fips'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -921,9 +921,9 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
       fips: true
 
-  photonos-4-arm64-pkg-tests-fips:
+  test-pkg-photonos-4-arm64-fips:
     name: Photon OS 4 Arm64 Package Test (fips)
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['photonos-4-arm64-pkg-tests-fips'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-photonos-4-arm64-fips'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -944,9 +944,9 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
       fips: true
 
-  photonos-5-pkg-tests:
+  test-pkg-photonos-5:
     name: Photon OS 5 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['photonos-5-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-photonos-5'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -966,9 +966,9 @@ jobs:
       skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  photonos-5-arm64-pkg-tests:
+  test-pkg-photonos-5-arm64:
     name: Photon OS 5 Arm64 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['photonos-5-arm64-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-photonos-5-arm64'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -988,9 +988,9 @@ jobs:
       skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  photonos-5-pkg-tests-fips:
+  test-pkg-photonos-5-fips:
     name: Photon OS 5 Package Test (fips)
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['photonos-5-pkg-tests-fips'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-photonos-5-fips'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -1011,9 +1011,9 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
       fips: true
 
-  photonos-5-arm64-pkg-tests-fips:
+  test-pkg-photonos-5-arm64-fips:
     name: Photon OS 5 Arm64 Package Test (fips)
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['photonos-5-arm64-pkg-tests-fips'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-photonos-5-arm64-fips'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -1034,9 +1034,9 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
       fips: true
 
-  ubuntu-2004-pkg-tests:
+  test-pkg-ubuntu-2004:
     name: Ubuntu 20.04 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['ubuntu-2004-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-ubuntu-2004'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -1056,9 +1056,9 @@ jobs:
       skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  ubuntu-2004-arm64-pkg-tests:
+  test-pkg-ubuntu-2004-arm64:
     name: Ubuntu 20.04 Arm64 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['ubuntu-2004-arm64-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-ubuntu-2004-arm64'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -1078,9 +1078,9 @@ jobs:
       skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  ubuntu-2204-pkg-tests:
+  test-pkg-ubuntu-2204:
     name: Ubuntu 22.04 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['ubuntu-2204-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-ubuntu-2204'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -1100,9 +1100,9 @@ jobs:
       skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  ubuntu-2204-arm64-pkg-tests:
+  test-pkg-ubuntu-2204-arm64:
     name: Ubuntu 22.04 Arm64 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['ubuntu-2204-arm64-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-ubuntu-2204-arm64'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -1122,9 +1122,9 @@ jobs:
       skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  ubuntu-2404-pkg-tests:
+  test-pkg-ubuntu-2404:
     name: Ubuntu 24.04 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['ubuntu-2404-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-ubuntu-2404'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -1144,9 +1144,9 @@ jobs:
       skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  ubuntu-2404-arm64-pkg-tests:
+  test-pkg-ubuntu-2404-arm64:
     name: Ubuntu 24.04 Arm64 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['ubuntu-2404-arm64-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-ubuntu-2404-arm64'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -2147,32 +2147,32 @@ jobs:
       - test-ubuntu-2204-arm64
       - test-ubuntu-2404
       - test-ubuntu-2404-arm64
-      - rockylinux-8-pkg-tests
-      - rockylinux-8-arm64-pkg-tests
-      - rockylinux-9-pkg-tests
-      - rockylinux-9-arm64-pkg-tests
-      - amazonlinux-2-pkg-tests
-      - amazonlinux-2-arm64-pkg-tests
-      - amazonlinux-2023-pkg-tests
-      - amazonlinux-2023-arm64-pkg-tests
-      - debian-11-pkg-tests
-      - debian-11-arm64-pkg-tests
-      - debian-12-pkg-tests
-      - debian-12-arm64-pkg-tests
-      - photonos-4-pkg-tests
-      - photonos-4-arm64-pkg-tests
-      - photonos-4-pkg-tests-fips
-      - photonos-4-arm64-pkg-tests-fips
-      - photonos-5-pkg-tests
-      - photonos-5-arm64-pkg-tests
-      - photonos-5-pkg-tests-fips
-      - photonos-5-arm64-pkg-tests-fips
-      - ubuntu-2004-pkg-tests
-      - ubuntu-2004-arm64-pkg-tests
-      - ubuntu-2204-pkg-tests
-      - ubuntu-2204-arm64-pkg-tests
-      - ubuntu-2404-pkg-tests
-      - ubuntu-2404-arm64-pkg-tests
+      - test-pkg-rockylinux-8
+      - test-pkg-rockylinux-8-arm64
+      - test-pkg-rockylinux-9
+      - test-pkg-rockylinux-9-arm64
+      - test-pkg-amazonlinux-2
+      - test-pkg-amazonlinux-2-arm64
+      - test-pkg-amazonlinux-2023
+      - test-pkg-amazonlinux-2023-arm64
+      - test-pkg-debian-11
+      - test-pkg-debian-11-arm64
+      - test-pkg-debian-12
+      - test-pkg-debian-12-arm64
+      - test-pkg-photonos-4
+      - test-pkg-photonos-4-arm64
+      - test-pkg-photonos-4-fips
+      - test-pkg-photonos-4-arm64-fips
+      - test-pkg-photonos-5
+      - test-pkg-photonos-5-arm64
+      - test-pkg-photonos-5-fips
+      - test-pkg-photonos-5-arm64-fips
+      - test-pkg-ubuntu-2004
+      - test-pkg-ubuntu-2004-arm64
+      - test-pkg-ubuntu-2204
+      - test-pkg-ubuntu-2204-arm64
+      - test-pkg-ubuntu-2404
+      - test-pkg-ubuntu-2404-arm64
       - test-pkg-macos-12
       - test-pkg-windows-2019-nsis
       - test-pkg-windows-2019-msi
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 96fd94d1b28..96385b90bbf 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -713,9 +713,9 @@ jobs:
       nox-archive-hash: "${{ needs.prepare-workflow.outputs.nox-archive-hash }}"
       kind: windows
 
-  rockylinux-8-pkg-tests:
+  test-pkg-rockylinux-8:
     name: Rocky Linux 8 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['rockylinux-8-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-rockylinux-8'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -735,9 +735,9 @@ jobs:
       skip-code-coverage: true
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  rockylinux-8-arm64-pkg-tests:
+  test-pkg-rockylinux-8-arm64:
     name: Rocky Linux 8 Arm64 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['rockylinux-8-arm64-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-rockylinux-8-arm64'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -757,9 +757,9 @@ jobs:
       skip-code-coverage: true
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  rockylinux-9-pkg-tests:
+  test-pkg-rockylinux-9:
     name: Rocky Linux 9 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['rockylinux-9-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-rockylinux-9'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -779,9 +779,9 @@ jobs:
       skip-code-coverage: true
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  rockylinux-9-arm64-pkg-tests:
+  test-pkg-rockylinux-9-arm64:
     name: Rocky Linux 9 Arm64 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['rockylinux-9-arm64-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-rockylinux-9-arm64'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -801,9 +801,9 @@ jobs:
       skip-code-coverage: true
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  amazonlinux-2-pkg-tests:
+  test-pkg-amazonlinux-2:
     name: Amazon Linux 2 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['amazonlinux-2-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-amazonlinux-2'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -823,9 +823,9 @@ jobs:
       skip-code-coverage: true
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  amazonlinux-2-arm64-pkg-tests:
+  test-pkg-amazonlinux-2-arm64:
     name: Amazon Linux 2 Arm64 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['amazonlinux-2-arm64-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-amazonlinux-2-arm64'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -845,9 +845,9 @@ jobs:
       skip-code-coverage: true
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  amazonlinux-2023-pkg-tests:
+  test-pkg-amazonlinux-2023:
     name: Amazon Linux 2023 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['amazonlinux-2023-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-amazonlinux-2023'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -867,9 +867,9 @@ jobs:
       skip-code-coverage: true
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  amazonlinux-2023-arm64-pkg-tests:
+  test-pkg-amazonlinux-2023-arm64:
     name: Amazon Linux 2023 Arm64 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['amazonlinux-2023-arm64-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-amazonlinux-2023-arm64'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -889,9 +889,9 @@ jobs:
       skip-code-coverage: true
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  debian-11-pkg-tests:
+  test-pkg-debian-11:
     name: Debian 11 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['debian-11-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-debian-11'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -911,9 +911,9 @@ jobs:
       skip-code-coverage: true
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  debian-11-arm64-pkg-tests:
+  test-pkg-debian-11-arm64:
     name: Debian 11 Arm64 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['debian-11-arm64-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-debian-11-arm64'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -933,9 +933,9 @@ jobs:
       skip-code-coverage: true
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  debian-12-pkg-tests:
+  test-pkg-debian-12:
     name: Debian 12 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['debian-12-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-debian-12'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -955,9 +955,9 @@ jobs:
       skip-code-coverage: true
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  debian-12-arm64-pkg-tests:
+  test-pkg-debian-12-arm64:
     name: Debian 12 Arm64 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['debian-12-arm64-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-debian-12-arm64'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -977,9 +977,9 @@ jobs:
       skip-code-coverage: true
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  photonos-4-pkg-tests:
+  test-pkg-photonos-4:
     name: Photon OS 4 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['photonos-4-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-photonos-4'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -999,9 +999,9 @@ jobs:
       skip-code-coverage: true
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  photonos-4-arm64-pkg-tests:
+  test-pkg-photonos-4-arm64:
     name: Photon OS 4 Arm64 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['photonos-4-arm64-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-photonos-4-arm64'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -1021,9 +1021,9 @@ jobs:
       skip-code-coverage: true
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  photonos-4-pkg-tests-fips:
+  test-pkg-photonos-4-fips:
     name: Photon OS 4 Package Test (fips)
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['photonos-4-pkg-tests-fips'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-photonos-4-fips'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -1044,9 +1044,9 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
       fips: true
 
-  photonos-4-arm64-pkg-tests-fips:
+  test-pkg-photonos-4-arm64-fips:
     name: Photon OS 4 Arm64 Package Test (fips)
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['photonos-4-arm64-pkg-tests-fips'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-photonos-4-arm64-fips'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -1067,9 +1067,9 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
       fips: true
 
-  photonos-5-pkg-tests:
+  test-pkg-photonos-5:
     name: Photon OS 5 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['photonos-5-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-photonos-5'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -1089,9 +1089,9 @@ jobs:
       skip-code-coverage: true
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  photonos-5-arm64-pkg-tests:
+  test-pkg-photonos-5-arm64:
     name: Photon OS 5 Arm64 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['photonos-5-arm64-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-photonos-5-arm64'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -1111,9 +1111,9 @@ jobs:
       skip-code-coverage: true
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  photonos-5-pkg-tests-fips:
+  test-pkg-photonos-5-fips:
     name: Photon OS 5 Package Test (fips)
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['photonos-5-pkg-tests-fips'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-photonos-5-fips'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -1134,9 +1134,9 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
       fips: true
 
-  photonos-5-arm64-pkg-tests-fips:
+  test-pkg-photonos-5-arm64-fips:
     name: Photon OS 5 Arm64 Package Test (fips)
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['photonos-5-arm64-pkg-tests-fips'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-photonos-5-arm64-fips'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -1157,9 +1157,9 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
       fips: true
 
-  ubuntu-2004-pkg-tests:
+  test-pkg-ubuntu-2004:
     name: Ubuntu 20.04 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['ubuntu-2004-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-ubuntu-2004'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -1179,9 +1179,9 @@ jobs:
       skip-code-coverage: true
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  ubuntu-2004-arm64-pkg-tests:
+  test-pkg-ubuntu-2004-arm64:
     name: Ubuntu 20.04 Arm64 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['ubuntu-2004-arm64-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-ubuntu-2004-arm64'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -1201,9 +1201,9 @@ jobs:
       skip-code-coverage: true
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  ubuntu-2204-pkg-tests:
+  test-pkg-ubuntu-2204:
     name: Ubuntu 22.04 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['ubuntu-2204-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-ubuntu-2204'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -1223,9 +1223,9 @@ jobs:
       skip-code-coverage: true
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  ubuntu-2204-arm64-pkg-tests:
+  test-pkg-ubuntu-2204-arm64:
     name: Ubuntu 22.04 Arm64 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['ubuntu-2204-arm64-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-ubuntu-2204-arm64'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -1245,9 +1245,9 @@ jobs:
       skip-code-coverage: true
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  ubuntu-2404-pkg-tests:
+  test-pkg-ubuntu-2404:
     name: Ubuntu 24.04 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['ubuntu-2404-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-ubuntu-2404'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -1267,9 +1267,9 @@ jobs:
       skip-code-coverage: true
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  ubuntu-2404-arm64-pkg-tests:
+  test-pkg-ubuntu-2404-arm64:
     name: Ubuntu 24.04 Arm64 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['ubuntu-2404-arm64-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-ubuntu-2404-arm64'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -2899,32 +2899,32 @@ jobs:
       - build-pkgs-src-macos
       - build-pkgs-src-windows
       - publish-repositories
-      - rockylinux-8-pkg-tests
-      - rockylinux-8-arm64-pkg-tests
-      - rockylinux-9-pkg-tests
-      - rockylinux-9-arm64-pkg-tests
-      - amazonlinux-2-pkg-tests
-      - amazonlinux-2-arm64-pkg-tests
-      - amazonlinux-2023-pkg-tests
-      - amazonlinux-2023-arm64-pkg-tests
-      - debian-11-pkg-tests
-      - debian-11-arm64-pkg-tests
-      - debian-12-pkg-tests
-      - debian-12-arm64-pkg-tests
-      - photonos-4-pkg-tests
-      - photonos-4-arm64-pkg-tests
-      - photonos-4-pkg-tests-fips
-      - photonos-4-arm64-pkg-tests-fips
-      - photonos-5-pkg-tests
-      - photonos-5-arm64-pkg-tests
-      - photonos-5-pkg-tests-fips
-      - photonos-5-arm64-pkg-tests-fips
-      - ubuntu-2004-pkg-tests
-      - ubuntu-2004-arm64-pkg-tests
-      - ubuntu-2204-pkg-tests
-      - ubuntu-2204-arm64-pkg-tests
-      - ubuntu-2404-pkg-tests
-      - ubuntu-2404-arm64-pkg-tests
+      - test-pkg-rockylinux-8
+      - test-pkg-rockylinux-8-arm64
+      - test-pkg-rockylinux-9
+      - test-pkg-rockylinux-9-arm64
+      - test-pkg-amazonlinux-2
+      - test-pkg-amazonlinux-2-arm64
+      - test-pkg-amazonlinux-2023
+      - test-pkg-amazonlinux-2023-arm64
+      - test-pkg-debian-11
+      - test-pkg-debian-11-arm64
+      - test-pkg-debian-12
+      - test-pkg-debian-12-arm64
+      - test-pkg-photonos-4
+      - test-pkg-photonos-4-arm64
+      - test-pkg-photonos-4-fips
+      - test-pkg-photonos-4-arm64-fips
+      - test-pkg-photonos-5
+      - test-pkg-photonos-5-arm64
+      - test-pkg-photonos-5-fips
+      - test-pkg-photonos-5-arm64-fips
+      - test-pkg-ubuntu-2004
+      - test-pkg-ubuntu-2004-arm64
+      - test-pkg-ubuntu-2204
+      - test-pkg-ubuntu-2204-arm64
+      - test-pkg-ubuntu-2404
+      - test-pkg-ubuntu-2404-arm64
       - test-pkg-macos-12
       - test-pkg-windows-2019-nsis
       - test-pkg-windows-2019-msi
diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml
index 544db448ecc..141e3c60806 100644
--- a/.github/workflows/scheduled.yml
+++ b/.github/workflows/scheduled.yml
@@ -629,9 +629,9 @@ jobs:
       nox-archive-hash: "${{ needs.prepare-workflow.outputs.nox-archive-hash }}"
       kind: windows
 
-  rockylinux-8-pkg-tests:
+  test-pkg-rockylinux-8:
     name: Rocky Linux 8 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['rockylinux-8-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-rockylinux-8'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -651,9 +651,9 @@ jobs:
       skip-code-coverage: true
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  rockylinux-8-arm64-pkg-tests:
+  test-pkg-rockylinux-8-arm64:
     name: Rocky Linux 8 Arm64 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['rockylinux-8-arm64-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-rockylinux-8-arm64'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -673,9 +673,9 @@ jobs:
       skip-code-coverage: true
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  rockylinux-9-pkg-tests:
+  test-pkg-rockylinux-9:
     name: Rocky Linux 9 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['rockylinux-9-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-rockylinux-9'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -695,9 +695,9 @@ jobs:
       skip-code-coverage: true
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  rockylinux-9-arm64-pkg-tests:
+  test-pkg-rockylinux-9-arm64:
     name: Rocky Linux 9 Arm64 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['rockylinux-9-arm64-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-rockylinux-9-arm64'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -717,9 +717,9 @@ jobs:
       skip-code-coverage: true
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  amazonlinux-2-pkg-tests:
+  test-pkg-amazonlinux-2:
     name: Amazon Linux 2 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['amazonlinux-2-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-amazonlinux-2'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -739,9 +739,9 @@ jobs:
       skip-code-coverage: true
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  amazonlinux-2-arm64-pkg-tests:
+  test-pkg-amazonlinux-2-arm64:
     name: Amazon Linux 2 Arm64 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['amazonlinux-2-arm64-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-amazonlinux-2-arm64'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -761,9 +761,9 @@ jobs:
       skip-code-coverage: true
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  amazonlinux-2023-pkg-tests:
+  test-pkg-amazonlinux-2023:
     name: Amazon Linux 2023 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['amazonlinux-2023-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-amazonlinux-2023'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -783,9 +783,9 @@ jobs:
       skip-code-coverage: true
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  amazonlinux-2023-arm64-pkg-tests:
+  test-pkg-amazonlinux-2023-arm64:
     name: Amazon Linux 2023 Arm64 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['amazonlinux-2023-arm64-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-amazonlinux-2023-arm64'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -805,9 +805,9 @@ jobs:
       skip-code-coverage: true
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  debian-11-pkg-tests:
+  test-pkg-debian-11:
     name: Debian 11 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['debian-11-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-debian-11'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -827,9 +827,9 @@ jobs:
       skip-code-coverage: true
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  debian-11-arm64-pkg-tests:
+  test-pkg-debian-11-arm64:
     name: Debian 11 Arm64 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['debian-11-arm64-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-debian-11-arm64'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -849,9 +849,9 @@ jobs:
       skip-code-coverage: true
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  debian-12-pkg-tests:
+  test-pkg-debian-12:
     name: Debian 12 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['debian-12-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-debian-12'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -871,9 +871,9 @@ jobs:
       skip-code-coverage: true
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  debian-12-arm64-pkg-tests:
+  test-pkg-debian-12-arm64:
     name: Debian 12 Arm64 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['debian-12-arm64-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-debian-12-arm64'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -893,9 +893,9 @@ jobs:
       skip-code-coverage: true
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  photonos-4-pkg-tests:
+  test-pkg-photonos-4:
     name: Photon OS 4 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['photonos-4-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-photonos-4'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -915,9 +915,9 @@ jobs:
       skip-code-coverage: true
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  photonos-4-arm64-pkg-tests:
+  test-pkg-photonos-4-arm64:
     name: Photon OS 4 Arm64 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['photonos-4-arm64-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-photonos-4-arm64'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -937,9 +937,9 @@ jobs:
       skip-code-coverage: true
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  photonos-4-pkg-tests-fips:
+  test-pkg-photonos-4-fips:
     name: Photon OS 4 Package Test (fips)
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['photonos-4-pkg-tests-fips'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-photonos-4-fips'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -960,9 +960,9 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
       fips: true
 
-  photonos-4-arm64-pkg-tests-fips:
+  test-pkg-photonos-4-arm64-fips:
     name: Photon OS 4 Arm64 Package Test (fips)
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['photonos-4-arm64-pkg-tests-fips'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-photonos-4-arm64-fips'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -983,9 +983,9 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
       fips: true
 
-  photonos-5-pkg-tests:
+  test-pkg-photonos-5:
     name: Photon OS 5 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['photonos-5-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-photonos-5'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -1005,9 +1005,9 @@ jobs:
       skip-code-coverage: true
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  photonos-5-arm64-pkg-tests:
+  test-pkg-photonos-5-arm64:
     name: Photon OS 5 Arm64 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['photonos-5-arm64-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-photonos-5-arm64'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -1027,9 +1027,9 @@ jobs:
       skip-code-coverage: true
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  photonos-5-pkg-tests-fips:
+  test-pkg-photonos-5-fips:
     name: Photon OS 5 Package Test (fips)
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['photonos-5-pkg-tests-fips'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-photonos-5-fips'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -1050,9 +1050,9 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
       fips: true
 
-  photonos-5-arm64-pkg-tests-fips:
+  test-pkg-photonos-5-arm64-fips:
     name: Photon OS 5 Arm64 Package Test (fips)
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['photonos-5-arm64-pkg-tests-fips'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-photonos-5-arm64-fips'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -1073,9 +1073,9 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
       fips: true
 
-  ubuntu-2004-pkg-tests:
+  test-pkg-ubuntu-2004:
     name: Ubuntu 20.04 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['ubuntu-2004-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-ubuntu-2004'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -1095,9 +1095,9 @@ jobs:
       skip-code-coverage: true
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  ubuntu-2004-arm64-pkg-tests:
+  test-pkg-ubuntu-2004-arm64:
     name: Ubuntu 20.04 Arm64 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['ubuntu-2004-arm64-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-ubuntu-2004-arm64'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -1117,9 +1117,9 @@ jobs:
       skip-code-coverage: true
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  ubuntu-2204-pkg-tests:
+  test-pkg-ubuntu-2204:
     name: Ubuntu 22.04 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['ubuntu-2204-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-ubuntu-2204'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -1139,9 +1139,9 @@ jobs:
       skip-code-coverage: true
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  ubuntu-2204-arm64-pkg-tests:
+  test-pkg-ubuntu-2204-arm64:
     name: Ubuntu 22.04 Arm64 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['ubuntu-2204-arm64-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-ubuntu-2204-arm64'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -1161,9 +1161,9 @@ jobs:
       skip-code-coverage: true
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  ubuntu-2404-pkg-tests:
+  test-pkg-ubuntu-2404:
     name: Ubuntu 24.04 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['ubuntu-2404-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-ubuntu-2404'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -1183,9 +1183,9 @@ jobs:
       skip-code-coverage: true
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  ubuntu-2404-arm64-pkg-tests:
+  test-pkg-ubuntu-2404-arm64:
     name: Ubuntu 24.04 Arm64 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['ubuntu-2404-arm64-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-ubuntu-2404-arm64'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -2026,32 +2026,32 @@ jobs:
       - test-ubuntu-2204-arm64
       - test-ubuntu-2404
       - test-ubuntu-2404-arm64
-      - rockylinux-8-pkg-tests
-      - rockylinux-8-arm64-pkg-tests
-      - rockylinux-9-pkg-tests
-      - rockylinux-9-arm64-pkg-tests
-      - amazonlinux-2-pkg-tests
-      - amazonlinux-2-arm64-pkg-tests
-      - amazonlinux-2023-pkg-tests
-      - amazonlinux-2023-arm64-pkg-tests
-      - debian-11-pkg-tests
-      - debian-11-arm64-pkg-tests
-      - debian-12-pkg-tests
-      - debian-12-arm64-pkg-tests
-      - photonos-4-pkg-tests
-      - photonos-4-arm64-pkg-tests
-      - photonos-4-pkg-tests-fips
-      - photonos-4-arm64-pkg-tests-fips
-      - photonos-5-pkg-tests
-      - photonos-5-arm64-pkg-tests
-      - photonos-5-pkg-tests-fips
-      - photonos-5-arm64-pkg-tests-fips
-      - ubuntu-2004-pkg-tests
-      - ubuntu-2004-arm64-pkg-tests
-      - ubuntu-2204-pkg-tests
-      - ubuntu-2204-arm64-pkg-tests
-      - ubuntu-2404-pkg-tests
-      - ubuntu-2404-arm64-pkg-tests
+      - test-pkg-rockylinux-8
+      - test-pkg-rockylinux-8-arm64
+      - test-pkg-rockylinux-9
+      - test-pkg-rockylinux-9-arm64
+      - test-pkg-amazonlinux-2
+      - test-pkg-amazonlinux-2-arm64
+      - test-pkg-amazonlinux-2023
+      - test-pkg-amazonlinux-2023-arm64
+      - test-pkg-debian-11
+      - test-pkg-debian-11-arm64
+      - test-pkg-debian-12
+      - test-pkg-debian-12-arm64
+      - test-pkg-photonos-4
+      - test-pkg-photonos-4-arm64
+      - test-pkg-photonos-4-fips
+      - test-pkg-photonos-4-arm64-fips
+      - test-pkg-photonos-5
+      - test-pkg-photonos-5-arm64
+      - test-pkg-photonos-5-fips
+      - test-pkg-photonos-5-arm64-fips
+      - test-pkg-ubuntu-2004
+      - test-pkg-ubuntu-2004-arm64
+      - test-pkg-ubuntu-2204
+      - test-pkg-ubuntu-2204-arm64
+      - test-pkg-ubuntu-2404
+      - test-pkg-ubuntu-2404-arm64
       - test-pkg-macos-12
       - test-pkg-windows-2019-nsis
       - test-pkg-windows-2019-msi
diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml
index 8e4404e621d..18f65034f2f 100644
--- a/.github/workflows/staging.yml
+++ b/.github/workflows/staging.yml
@@ -695,9 +695,9 @@ jobs:
       nox-archive-hash: "${{ needs.prepare-workflow.outputs.nox-archive-hash }}"
       kind: windows
 
-  rockylinux-8-pkg-tests:
+  test-pkg-rockylinux-8:
     name: Rocky Linux 8 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['rockylinux-8-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-rockylinux-8'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -717,9 +717,9 @@ jobs:
       skip-code-coverage: true
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  rockylinux-8-arm64-pkg-tests:
+  test-pkg-rockylinux-8-arm64:
     name: Rocky Linux 8 Arm64 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['rockylinux-8-arm64-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-rockylinux-8-arm64'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -739,9 +739,9 @@ jobs:
       skip-code-coverage: true
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  rockylinux-9-pkg-tests:
+  test-pkg-rockylinux-9:
     name: Rocky Linux 9 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['rockylinux-9-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-rockylinux-9'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -761,9 +761,9 @@ jobs:
       skip-code-coverage: true
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  rockylinux-9-arm64-pkg-tests:
+  test-pkg-rockylinux-9-arm64:
     name: Rocky Linux 9 Arm64 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['rockylinux-9-arm64-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-rockylinux-9-arm64'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -783,9 +783,9 @@ jobs:
       skip-code-coverage: true
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  amazonlinux-2-pkg-tests:
+  test-pkg-amazonlinux-2:
     name: Amazon Linux 2 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['amazonlinux-2-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-amazonlinux-2'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -805,9 +805,9 @@ jobs:
       skip-code-coverage: true
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  amazonlinux-2-arm64-pkg-tests:
+  test-pkg-amazonlinux-2-arm64:
     name: Amazon Linux 2 Arm64 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['amazonlinux-2-arm64-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-amazonlinux-2-arm64'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -827,9 +827,9 @@ jobs:
       skip-code-coverage: true
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  amazonlinux-2023-pkg-tests:
+  test-pkg-amazonlinux-2023:
     name: Amazon Linux 2023 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['amazonlinux-2023-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-amazonlinux-2023'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -849,9 +849,9 @@ jobs:
       skip-code-coverage: true
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  amazonlinux-2023-arm64-pkg-tests:
+  test-pkg-amazonlinux-2023-arm64:
     name: Amazon Linux 2023 Arm64 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['amazonlinux-2023-arm64-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-amazonlinux-2023-arm64'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -871,9 +871,9 @@ jobs:
       skip-code-coverage: true
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  debian-11-pkg-tests:
+  test-pkg-debian-11:
     name: Debian 11 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['debian-11-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-debian-11'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -893,9 +893,9 @@ jobs:
       skip-code-coverage: true
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  debian-11-arm64-pkg-tests:
+  test-pkg-debian-11-arm64:
     name: Debian 11 Arm64 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['debian-11-arm64-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-debian-11-arm64'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -915,9 +915,9 @@ jobs:
       skip-code-coverage: true
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  debian-12-pkg-tests:
+  test-pkg-debian-12:
     name: Debian 12 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['debian-12-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-debian-12'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -937,9 +937,9 @@ jobs:
       skip-code-coverage: true
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  debian-12-arm64-pkg-tests:
+  test-pkg-debian-12-arm64:
     name: Debian 12 Arm64 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['debian-12-arm64-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-debian-12-arm64'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -959,9 +959,9 @@ jobs:
       skip-code-coverage: true
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  photonos-4-pkg-tests:
+  test-pkg-photonos-4:
     name: Photon OS 4 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['photonos-4-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-photonos-4'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -981,9 +981,9 @@ jobs:
       skip-code-coverage: true
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  photonos-4-arm64-pkg-tests:
+  test-pkg-photonos-4-arm64:
     name: Photon OS 4 Arm64 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['photonos-4-arm64-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-photonos-4-arm64'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -1003,9 +1003,9 @@ jobs:
       skip-code-coverage: true
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  photonos-4-pkg-tests-fips:
+  test-pkg-photonos-4-fips:
     name: Photon OS 4 Package Test (fips)
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['photonos-4-pkg-tests-fips'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-photonos-4-fips'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -1026,9 +1026,9 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
       fips: true
 
-  photonos-4-arm64-pkg-tests-fips:
+  test-pkg-photonos-4-arm64-fips:
     name: Photon OS 4 Arm64 Package Test (fips)
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['photonos-4-arm64-pkg-tests-fips'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-photonos-4-arm64-fips'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -1049,9 +1049,9 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
       fips: true
 
-  photonos-5-pkg-tests:
+  test-pkg-photonos-5:
     name: Photon OS 5 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['photonos-5-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-photonos-5'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -1071,9 +1071,9 @@ jobs:
       skip-code-coverage: true
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  photonos-5-arm64-pkg-tests:
+  test-pkg-photonos-5-arm64:
     name: Photon OS 5 Arm64 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['photonos-5-arm64-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-photonos-5-arm64'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -1093,9 +1093,9 @@ jobs:
       skip-code-coverage: true
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  photonos-5-pkg-tests-fips:
+  test-pkg-photonos-5-fips:
     name: Photon OS 5 Package Test (fips)
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['photonos-5-pkg-tests-fips'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-photonos-5-fips'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -1116,9 +1116,9 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
       fips: true
 
-  photonos-5-arm64-pkg-tests-fips:
+  test-pkg-photonos-5-arm64-fips:
     name: Photon OS 5 Arm64 Package Test (fips)
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['photonos-5-arm64-pkg-tests-fips'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-photonos-5-arm64-fips'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -1139,9 +1139,9 @@ jobs:
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
       fips: true
 
-  ubuntu-2004-pkg-tests:
+  test-pkg-ubuntu-2004:
     name: Ubuntu 20.04 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['ubuntu-2004-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-ubuntu-2004'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -1161,9 +1161,9 @@ jobs:
       skip-code-coverage: true
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  ubuntu-2004-arm64-pkg-tests:
+  test-pkg-ubuntu-2004-arm64:
     name: Ubuntu 20.04 Arm64 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['ubuntu-2004-arm64-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-ubuntu-2004-arm64'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -1183,9 +1183,9 @@ jobs:
       skip-code-coverage: true
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  ubuntu-2204-pkg-tests:
+  test-pkg-ubuntu-2204:
     name: Ubuntu 22.04 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['ubuntu-2204-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-ubuntu-2204'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -1205,9 +1205,9 @@ jobs:
       skip-code-coverage: true
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  ubuntu-2204-arm64-pkg-tests:
+  test-pkg-ubuntu-2204-arm64:
     name: Ubuntu 22.04 Arm64 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['ubuntu-2204-arm64-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-ubuntu-2204-arm64'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -1227,9 +1227,9 @@ jobs:
       skip-code-coverage: true
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  ubuntu-2404-pkg-tests:
+  test-pkg-ubuntu-2404:
     name: Ubuntu 24.04 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['ubuntu-2404-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-ubuntu-2404'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -1249,9 +1249,9 @@ jobs:
       skip-code-coverage: true
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  ubuntu-2404-arm64-pkg-tests:
+  test-pkg-ubuntu-2404-arm64:
     name: Ubuntu 24.04 Arm64 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['ubuntu-2404-arm64-pkg-tests'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.config)['jobs']['test-pkg-ubuntu-2404-arm64'] }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir-linux
@@ -2947,32 +2947,32 @@ jobs:
       - test-ubuntu-2204-arm64
       - test-ubuntu-2404
       - test-ubuntu-2404-arm64
-      - rockylinux-8-pkg-tests
-      - rockylinux-8-arm64-pkg-tests
-      - rockylinux-9-pkg-tests
-      - rockylinux-9-arm64-pkg-tests
-      - amazonlinux-2-pkg-tests
-      - amazonlinux-2-arm64-pkg-tests
-      - amazonlinux-2023-pkg-tests
-      - amazonlinux-2023-arm64-pkg-tests
-      - debian-11-pkg-tests
-      - debian-11-arm64-pkg-tests
-      - debian-12-pkg-tests
-      - debian-12-arm64-pkg-tests
-      - photonos-4-pkg-tests
-      - photonos-4-arm64-pkg-tests
-      - photonos-4-pkg-tests-fips
-      - photonos-4-arm64-pkg-tests-fips
-      - photonos-5-pkg-tests
-      - photonos-5-arm64-pkg-tests
-      - photonos-5-pkg-tests-fips
-      - photonos-5-arm64-pkg-tests-fips
-      - ubuntu-2004-pkg-tests
-      - ubuntu-2004-arm64-pkg-tests
-      - ubuntu-2204-pkg-tests
-      - ubuntu-2204-arm64-pkg-tests
-      - ubuntu-2404-pkg-tests
-      - ubuntu-2404-arm64-pkg-tests
+      - test-pkg-rockylinux-8
+      - test-pkg-rockylinux-8-arm64
+      - test-pkg-rockylinux-9
+      - test-pkg-rockylinux-9-arm64
+      - test-pkg-amazonlinux-2
+      - test-pkg-amazonlinux-2-arm64
+      - test-pkg-amazonlinux-2023
+      - test-pkg-amazonlinux-2023-arm64
+      - test-pkg-debian-11
+      - test-pkg-debian-11-arm64
+      - test-pkg-debian-12
+      - test-pkg-debian-12-arm64
+      - test-pkg-photonos-4
+      - test-pkg-photonos-4-arm64
+      - test-pkg-photonos-4-fips
+      - test-pkg-photonos-4-arm64-fips
+      - test-pkg-photonos-5
+      - test-pkg-photonos-5-arm64
+      - test-pkg-photonos-5-fips
+      - test-pkg-photonos-5-arm64-fips
+      - test-pkg-ubuntu-2004
+      - test-pkg-ubuntu-2004-arm64
+      - test-pkg-ubuntu-2204
+      - test-pkg-ubuntu-2204-arm64
+      - test-pkg-ubuntu-2404
+      - test-pkg-ubuntu-2404-arm64
       - test-pkg-macos-12
       - test-pkg-windows-2019-nsis
       - test-pkg-windows-2019-msi
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 68821fd8ba5..dff763df412 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -59,7 +59,7 @@ repos:
       - id: tools
         alias: generate-workflows
         name: Generate GitHub Workflow Templates
-        files: ^(cicd/shared-gh-workflows-context\.yml|tools/precommit/workflows\.py|.github/workflows/.*)$
+        files: ^(cicd/shared-gh-workflows-context\.yml|tools/utils/__init__.py|tools/precommit/workflows\.py|.github/workflows/.*)$
         pass_filenames: false
         args:
           - pre-commit
diff --git a/tools/utils/__init__.py b/tools/utils/__init__.py
index e44147d0a59..be3954b72e5 100644
--- a/tools/utils/__init__.py
+++ b/tools/utils/__init__.py
@@ -79,9 +79,7 @@ class LinuxPkg(Linux):
 
     @property
     def job_name(self):
-        return (
-            f"{ self.slug.replace('.', '') }-pkg-tests{ '-fips' if self.fips else ''}"
-        )
+        return f"test-pkg-{ self.slug.replace('.', '') }{ '-fips' if self.fips else ''}"
 
 
 @attr.s(frozen=True, slots=True)