diff --git a/.gitlab-ci/test-source-dep.yml b/.gitlab-ci/test-source-dep.yml
index 7d30f202290..bf830103bc4 100644
--- a/.gitlab-ci/test-source-dep.yml
+++ b/.gitlab-ci/test-source-dep.yml
@@ -66,7 +66,7 @@
       - src/gallium/auxiliary/**/*
       - src/gallium/drivers/*
       - src/gallium/include/**/*
-      - src/gallium/state_trackers/**/*
+      - src/gallium/frontends/**/*
       - src/gallium/targets/**/*
       - src/gallium/tests/**/*
       - src/gallium/winsys/*
diff --git a/.pick_status.json b/.pick_status.json
index 6471e6142e1..aa65ffb077d 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -4234,7 +4234,7 @@
         "description": "Fix up leftover \"state_trackers\" references to \"frontends\"",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "d6287a94b697ffe12a4e576a38943cdf4e90cdb0"
     },
diff --git a/REVIEWERS b/REVIEWERS
index 1a234ee2ec6..ece5394cff5 100644
--- a/REVIEWERS
+++ b/REVIEWERS
@@ -53,7 +53,7 @@ HAIKU
 R: Alexander von Gluck IV <kallisti5@unixzen.com>
 F: include/HaikuGL/
 F: src/egl/drivers/haiku/
-F: src/gallium/state_trackers/hgl/
+F: src/gallium/frontends/hgl/
 F: src/gallium/targets/haiku-softpipe/
 F: src/gallium/winsys/sw/hgl/
 F: src/hgl/