As identified in #829 and #833. Fixes #829.
Since we touch this anyway, this commit additionally makes the identifiers in the benchmark files a little bit more consistent.
This is necessary before we can merge #833. I preferred a separate PR because it makes it easier to see the results of Travis in #833.