diff --git a/.github/benchmarks/general.yaml b/.github/benchmarks/general.yaml
index cfabc6e118..d958a2c89d 100644
--- a/.github/benchmarks/general.yaml
+++ b/.github/benchmarks/general.yaml
@@ -2,7 +2,7 @@
   plot_group: Startup Time
   name: 1 core
   bin: startup_benchmark
-  hermit_rs_manifest_path: benches/startup/Cargo.toml
+  hermit_rs_manifest_path: benches/startup_benchmark/Cargo.toml
   command: |
     sudo qemu-system-x86_64 \
       -accel kvm \
@@ -21,7 +21,7 @@
   plot_group: Startup Time
   name: 2 cores
   bin: startup_benchmark
-  hermit_rs_manifest_path: benches/startup/Cargo.toml
+  hermit_rs_manifest_path: benches/startup_benchmark/Cargo.toml
   command: |
     sudo qemu-system-x86_64 \
       -accel kvm \
@@ -40,7 +40,7 @@
   plot_group: Startup Time
   name: 4 cores
   bin: startup_benchmark
-  hermit_rs_manifest_path: benches/startup/Cargo.toml
+  hermit_rs_manifest_path: benches/startup_benchmark/Cargo.toml
   command: |
     sudo qemu-system-x86_64 \
       -accel kvm \
@@ -59,7 +59,7 @@
   plot_group: Multithreaded Pi Efficiency
   name: Pi Multithreaded Benchmark
   bin: multithreaded_benchmark
-  hermit_rs_manifest_path: benches/multithreaded/Cargo.toml
+  hermit_rs_manifest_path: benches/multithreaded_benchmark/Cargo.toml
   command: |
     sudo qemu-system-x86_64 \
       -accel kvm \
diff --git a/.github/benchmarks/misc.yaml b/.github/benchmarks/misc.yaml
index 2f8ecb8850..d0b18ec077 100644
--- a/.github/benchmarks/misc.yaml
+++ b/.github/benchmarks/misc.yaml
@@ -1,7 +1,7 @@
 - group: Micro
   name: Micro Benchmarks
   bin: micro_benchmarks
-  hermit_rs_manifest_path: benches/micro/Cargo.toml
+  hermit_rs_manifest_path: benches/micro_benchmarks/Cargo.toml
   command: |
     sudo qemu-system-x86_64 \
       -accel kvm \
@@ -18,7 +18,7 @@
 - group: Allocations
   name: Allocation Benchmarks
   bin: alloc_benchmarks
-  hermit_rs_manifest_path: benches/alloc/Cargo.toml
+  hermit_rs_manifest_path: benches/alloc_benchmarks/Cargo.toml
   command: |
     sudo qemu-system-x86_64 \
       -accel kvm \
@@ -35,7 +35,7 @@
 - group: Mutex
   name: Mutex Stress Test
   bin: mutex_benchmark
-  hermit_rs_manifest_path: benches/mutex/Cargo.toml
+  hermit_rs_manifest_path: benches/mutex_benchmark/Cargo.toml
   command: |
     sudo qemu-system-x86_64 \
       -accel kvm \
diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
index 1bad7d8bd0..c522d99918 100644
--- a/.github/workflows/benchmark.yml
+++ b/.github/workflows/benchmark.yml
@@ -27,7 +27,8 @@ jobs:
       - name: Checkout hermit-rs
         uses: actions/checkout@v7
         with:
-          repository: hermit-os/hermit-rs
+          repository: fogti/hermit-rs
+          ref: bulk-uniform-rename
       - name: Checkout hermit-kernel
         uses: actions/checkout@v7
         with:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8bdeef700c..89296f8b5d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -190,7 +190,8 @@ jobs:
       - name: Checkout hermit-rs
         uses: actions/checkout@v7
         with:
-          repository: hermit-os/hermit-rs
+          repository: fogti/hermit-rs
+          ref: bulk-uniform-rename
       - name: Checkout hermit-kernel
         uses: actions/checkout@v7
         with: