diff --git a/benchmarks/benchmark_template.cpp b/benchmarks/benchmark_template.cpp
index 9178393ff..393bd96fc 100644
--- a/benchmarks/benchmark_template.cpp
+++ b/benchmarks/benchmark_template.cpp
@@ -186,7 +186,7 @@ size_t count_whatwg_invalid() {
 }
 
 template <bool just_parse = false>
-static void BasicBench_whatwg(benchmark::State& state) {
+static void BENCHMARK_NAME(BasicBench_whatwg)(benchmark::State& state) {
   // volatile to prevent optimizations.
   volatile size_t success = 0;
   volatile size_t href_size = 0;
@@ -248,7 +248,10 @@ static void BasicBench_whatwg(benchmark::State& state) {
   state.counters["url/s"] = benchmark::Counter(
       std::size(url_examples), benchmark::Counter::kIsIterationInvariantRate);
 }
-BENCHMARK(BasicBench_whatwg);
+static auto* CONCAT(benchmark_register_, BENCHMARK_NAME(BasicBench_whatwg)) =
+    ::benchmark::RegisterBenchmark(BENCHMARK_PREFIX_STR "BasicBench_whatwg",
+                                   BENCHMARK_NAME(BasicBench_whatwg));
+
 // There is no need for BasicBench_whatwg_just_parse because whatwg appears to
 // provide the href at a minimal cost, probably because it is already
 // materialized. auto BasicBench_whatwg_just_parse =
diff --git a/benchmarks/wpt_bench.cpp b/benchmarks/wpt_bench.cpp
index 814e17db3..08ccb0577 100644
--- a/benchmarks/wpt_bench.cpp
+++ b/benchmarks/wpt_bench.cpp
@@ -144,16 +144,17 @@ static void BasicBench_AdaURL(benchmark::State &state) {
       benchmark::Counter(double(std::size(url_examples)),
                          benchmark::Counter::kIsIterationInvariantRate);
 }
-auto BasicBench_AdaURL_url = BasicBench_AdaURL<ada::url>;
-BENCHMARK(BasicBench_AdaURL_url);
-auto BasicBench_AdaURL_url_aggregator = BasicBench_AdaURL<ada::url_aggregator>;
-BENCHMARK(BasicBench_AdaURL_url_aggregator);
+auto WptBench_BasicBench_AdaURL_url = BasicBench_AdaURL<ada::url>;
+BENCHMARK(WptBench_BasicBench_AdaURL_url);
+auto WptBench_BasicBench_AdaURL_url_aggregator =
+    BasicBench_AdaURL<ada::url_aggregator>;
+BENCHMARK(WptBench_BasicBench_AdaURL_url_aggregator);
 
 #if ADA_url_whatwg_ENABLED
 
 #include <upa/url.h>
 
-static void BasicBench_whatwg(benchmark::State &state) {
+static void WptBench_BasicBench_whatwg(benchmark::State &state) {
   volatile size_t success{};
   for (auto _ : state) {
     for (const std::pair<std::string, std::string> &url_strings :
@@ -224,7 +225,7 @@ static void BasicBench_whatwg(benchmark::State &state) {
       benchmark::Counter(double(std::size(url_examples)),
                          benchmark::Counter::kIsIterationInvariantRate);
 }
-BENCHMARK(BasicBench_whatwg);
+BENCHMARK(WptBench_BasicBench_whatwg);
 #endif  // ADA_url_whatwg_ENABLED
 
 int main(int argc, char **argv) {