Benchmarks: Make naming consistent

Change all references to 'benchmarkName' to 'benchmarkId'.