8 files changed, 10 insertions, 10 deletions
diff --git a/.github/workflows/ghcr.yml b/.github/workflows/ghcr.yml
index ffe8ae427aa..6d050d98cb2 100644
--- a/.github/workflows/ghcr.yml
+++ b/.github/workflows/ghcr.yml
@@ -53,9 +53,9 @@ jobs:
         run: |
           # List of DockerHub images to mirror to ghcr.io
           images=(
-            # Mirrored because used by pr-check-tidy, which doesn't cache Docker images
+            # Mirrored because used by the tidy job, which doesn't cache Docker images
             "ubuntu:22.04"
-            # Mirrored because used by all linux CI jobs, including pr-check-tidy
+            # Mirrored because used by all linux CI jobs, including tidy
             "moby/buildkit:buildx-stable-1"
             # Mirrored because used when CI is running inside a Docker container
             "alpine:3.4"
diff --git a/src/ci/citool/tests/jobs.rs b/src/ci/citool/tests/jobs.rs
index 3166ef287ea..dbaf13d4f42 100644
--- a/src/ci/citool/tests/jobs.rs
+++ b/src/ci/citool/tests/jobs.rs
@@ -40,7 +40,7 @@ try-job: dist-i686-msvc"#,
 fn pr_jobs() {
     let stdout = get_matrix("pull_request", "commit", "refs/heads/pr/1234");
     insta::assert_snapshot!(stdout, @r#"
-    jobs=[{"name":"pr-check-1","full_name":"PR - pr-check-1","os":"ubuntu-24.04","env":{"PR_CI_JOB":1},"free_disk":true},{"name":"pr-check-2","full_name":"PR - pr-check-2","os":"ubuntu-24.04","env":{"PR_CI_JOB":1},"free_disk":true},{"name":"pr-check-tidy","full_name":"PR - pr-check-tidy","os":"ubuntu-24.04","env":{"PR_CI_JOB":1},"continue_on_error":true,"free_disk":true,"doc_url":"https://foo.bar"}]
+    jobs=[{"name":"pr-check-1","full_name":"PR - pr-check-1","os":"ubuntu-24.04","env":{"PR_CI_JOB":1},"free_disk":true},{"name":"pr-check-2","full_name":"PR - pr-check-2","os":"ubuntu-24.04","env":{"PR_CI_JOB":1},"free_disk":true},{"name":"tidy","full_name":"PR - tidy","os":"ubuntu-24.04","env":{"PR_CI_JOB":1},"continue_on_error":true,"free_disk":true,"doc_url":"https://foo.bar"}]
     run_type=pr
     "#);
 }
diff --git a/src/ci/citool/tests/test-jobs.yml b/src/ci/citool/tests/test-jobs.yml
index 59042dcec74..b44c47c5c0d 100644
--- a/src/ci/citool/tests/test-jobs.yml
+++ b/src/ci/citool/tests/test-jobs.yml
@@ -68,7 +68,7 @@ pr:
     <<: *job-linux-4c
   - name: pr-check-2
     <<: *job-linux-4c
-  - name: pr-check-tidy
+  - name: tidy
     continue_on_error: true
     doc_url: https://foo.bar
     <<: *job-linux-4c
diff --git a/src/ci/docker/host-x86_64/pr-check-tidy/Dockerfile b/src/ci/docker/host-x86_64/tidy/Dockerfile
index 207c91eb7fe..dbb950cbe0c 100644
--- a/src/ci/docker/host-x86_64/pr-check-tidy/Dockerfile
+++ b/src/ci/docker/host-x86_64/tidy/Dockerfile
@@ -1,5 +1,5 @@
 # We use the ghcr base image because ghcr doesn't have a rate limit
-# and the pr-check-tidy job doesn't cache docker images in CI.
+# and the tidy job doesn't cache docker images in CI.
 FROM ghcr.io/rust-lang/ubuntu:22.04
 
 ARG DEBIAN_FRONTEND=noninteractive
@@ -29,7 +29,7 @@ RUN sh /scripts/nodejs.sh /node
 ENV PATH="/node/bin:${PATH}"
 
 # Install eslint
-COPY host-x86_64/pr-check-tidy/eslint.version /tmp/
+COPY host-x86_64/tidy/eslint.version /tmp/
 
 COPY scripts/sccache.sh /scripts/
 RUN sh /scripts/sccache.sh
diff --git a/src/ci/docker/host-x86_64/pr-check-tidy/eslint.version b/src/ci/docker/host-x86_64/tidy/eslint.version
index 1acea15afd6..1acea15afd6 100644
--- a/src/ci/docker/host-x86_64/pr-check-tidy/eslint.version
+++ b/src/ci/docker/host-x86_64/tidy/eslint.version
diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml
index 96b835f6b9b..8b78ffd2db9 100644
--- a/src/ci/github-actions/jobs.yml
+++ b/src/ci/github-actions/jobs.yml
@@ -126,7 +126,7 @@ pr:
     <<: *job-linux-4c
   - name: pr-check-2
     <<: *job-linux-4c
-  - name: pr-check-tidy
+  - name: tidy
     continue_on_error: true
     free_disk: false
     env:
@@ -318,7 +318,7 @@ auto:
   - name: pr-check-2
     <<: *job-linux-4c
 
-  - name: pr-check-tidy
+  - name: tidy
     free_disk: false
     <<: *job-linux-4c
 
diff --git a/src/doc/rustc-dev-guide/src/tests/ci.md b/src/doc/rustc-dev-guide/src/tests/ci.md
index 1ed790ba0c8..eba101a1398 100644
--- a/src/doc/rustc-dev-guide/src/tests/ci.md
+++ b/src/doc/rustc-dev-guide/src/tests/ci.md
@@ -67,7 +67,7 @@ kinds of builds (sets of jobs).
 
 After each push to a pull request, a set of `pr` jobs are executed. Currently,
 these execute the `x86_64-gnu-llvm-X`, `x86_64-gnu-tools`, `pr-check-1`, `pr-check-2`
-and `pr-check-tidy` jobs, all running on Linux. These execute a relatively short
+and `tidy` jobs, all running on Linux. These execute a relatively short
 (~40 minutes) and lightweight test suite that should catch common issues. More
 specifically, they run a set of lints, they try to perform a cross-compile check
 build to Windows mingw (without producing any artifacts) and they test the
diff --git a/src/tools/tidy/src/rustdoc_js.rs b/src/tools/tidy/src/rustdoc_js.rs
index e3907416431..5e924544f0d 100644
--- a/src/tools/tidy/src/rustdoc_js.rs
+++ b/src/tools/tidy/src/rustdoc_js.rs
@@ -52,7 +52,7 @@ fn get_eslint_version() -> Option<String> {
 }
 
 pub fn check(librustdoc_path: &Path, tools_path: &Path, src_path: &Path, bad: &mut bool) {
-    let eslint_version_path = src_path.join("ci/docker/host-x86_64/pr-check-tidy/eslint.version");
+    let eslint_version_path = src_path.join("ci/docker/host-x86_64/tidy/eslint.version");
     let eslint_version = match std::fs::read_to_string(&eslint_version_path) {
         Ok(version) => version.trim().to_string(),
         Err(error) => {