diff --git a/src/bench/bench.cpp b/src/bench/bench.cpp
index 9b74af51bfa..0b2ee6e30d1 100644
--- a/src/bench/bench.cpp
+++ b/src/bench/bench.cpp
@@ -5,6 +5,7 @@
 #include <bench/bench.h>
 
 #include <test/util/setup_common.h> // IWYU pragma: keep
+#include <util/check.h>
 #include <util/fs.h>
 
 #include <chrono>
@@ -71,7 +72,7 @@ BenchRunner::BenchmarkMap& BenchRunner::benchmarks()
 
 BenchRunner::BenchRunner(std::string name, BenchFunction func)
 {
-    benchmarks().insert(std::make_pair(name, func));
+    Assert(benchmarks().try_emplace(std::move(name), std::move(func)).second);
 }
 
 void BenchRunner::RunAll(const Args& args)
diff --git a/src/bench/bench.h b/src/bench/bench.h
index 591ea8bc805..14f0c4b053b 100644
--- a/src/bench/bench.h
+++ b/src/bench/bench.h
@@ -64,8 +64,8 @@ public:
 };
 } // namespace benchmark
 
-// BENCHMARK(foo) expands to:  benchmark::BenchRunner bench_11foo{"foo", foo};
+// BENCHMARK(foo) expands to:  benchmark::BenchRunner bench_runner_foo{"foo", foo};
 #define BENCHMARK(n) \
-    benchmark::BenchRunner PASTE2(bench_, PASTE2(__LINE__, n)){STRINGIZE(n), n};
+    benchmark::BenchRunner PASTE2(bench_runner_, n){STRINGIZE(n), n};
 
 #endif // BITCOIN_BENCH_BENCH_H