Revise benchmarks, change naming.