Change some names.
More test refactoring.