Improve naming, part 2...

...and avoid future mishaps with tests.