diff --git a/jobs/swh/core.yaml b/jobs/swh/core.yaml
index 2137ac6..c6a9d91 100644
--- a/jobs/swh/core.yaml
+++ b/jobs/swh/core.yaml
@@ -1,6 +1,6 @@
 - project:
     name: core
     jobs:
-      - swh-tests-{name}
-      - swh-metrics-{name}
-      - swh-build-{name}
+      - swh-{name}/tests
+      - swh-{name}/metrics
+      - swh-{name}/build
diff --git a/jobs/templates/swh-build.yaml b/jobs/templates/swh-build.yaml
index a80d24d..39569ad 100644
--- a/jobs/templates/swh-build.yaml
+++ b/jobs/templates/swh-build.yaml
@@ -1,30 +1,30 @@
 - job-template:
-    name: swh-build-{name}
+    name: swh-{name}/build
     node: swh-tox
 
     parameters:
       - string:
           name: BRANCH
           default: '{branch|master}'
     scm:
       - git:
           refspec: 'refs/heads/{branch|master}'
           url: https://forge.softwareheritage.org/source/swh-{name}.git
 
     numToKeep: 20
 
     triggers:
       - pollscm:
           cron: "H */3 * * *"
 
     wrappers:
       - timestamps
 
     builders:
       - shell: python3 setup.py sdist bdist_wheel
 
     publishers:
       - archive:
           artifacts: "dist/*"
           allow-empty: "true"
           fingerprint: "true"
diff --git a/jobs/templates/swh-metrics.yaml b/jobs/templates/swh-metrics.yaml
index 50cebdb..25b6ab0 100644
--- a/jobs/templates/swh-metrics.yaml
+++ b/jobs/templates/swh-metrics.yaml
@@ -1,29 +1,29 @@
 - job-template:
-    name: swh-metrics-{name}
+    name: swh-{name}/metrics
     node: swh-tox
 
     parameters:
       - string:
           name: BRANCH
           default: '{branch|master}'
     scm:
       - git:
           refspec: 'refs/heads/{branch|master}'
           url: https://forge.softwareheritage.org/source/swh-{name}.git
 
     numToKeep: 20
 
     triggers:
       - pollscm:
           cron: "H */3 * * *"
 
     wrappers:
       - timestamps
 
     builders:
       - shell: mkdir -p reports
       - shell: python3 -m tox -e flake8
 
       - shell: python3 -m radon raw --json swh/ > reports/radon_raw.json
       - shell: python3 -m radon cc --json swh/ > reports/radon_cc.json
       - shell: python3 -m radon mi --json swh/ > reports/radon_mi.json
diff --git a/jobs/templates/swh-tests.yaml b/jobs/templates/swh-tests.yaml
index e48944b..73dbdd4 100644
--- a/jobs/templates/swh-tests.yaml
+++ b/jobs/templates/swh-tests.yaml
@@ -1,66 +1,66 @@
 - job-template:
-    name: swh-tests-{name}
+    name: swh-{name}/tests
     node: swh-tox
 
     parameters:
       - string:
           name: BRANCH
           default: '{branch|master}'
     scm:
       - git:
           refspec: 'refs/heads/{branch|master}'
           url: https://forge.softwareheritage.org/source/swh-{name}.git
 
     numToKeep: 20
 
     triggers:
       - pollscm:
           cron: "H */3 * * *"
 
     wrappers:
       - timestamps
 
     builders:
       - shell: mkdir -p reports
       - shell: |
           if [ ! -f tox.ini ]
           then cat >tox.ini <<EOF
           [tox]
           envlist=py3
           [testenv:py3]
           deps =
             pifpaf
             nose
             coverage
           commands =
             pifpaf run postgresql -- nosetests {{posargs}}
           EOF
           fi
       - shell: >
           python3 -m tox -e py3 --
           --with-coverage --cover-xml
           --cover-xml-file=./reports/covergage.xml
           --cover-package=swh.{name}
           --with-xunit --xunit-file=./reports/test-results.xml
       - shell: python3 -m coverage xml -o ./reports/coverage.xml
 
     publishers:
       - junit:
           results: "reports/test-results.xml"
       - cobertura:
           report-file: "reports/coverage.xml"
           fail-no-reports: "false"
           fail-unhealthy: "false"
           fail-unstable: "false"
           only-stable: "false"
           source-encoding: "UTF_8"
           zoom-coverage-chart: "false"
           targets:
             - files:
                 healthy: 10
                 unhealthy: 20
                 failing: 30
             - method:
                 healthy: 50
                 unhealthy: 40
                 failing: 30