benchmark.submit -> benchmark benchmark.list -> list_benchmarks benchmark.abort -> abort_benchmark And fixed the related tests