More naming convention fixes for BenchmarkEventSource