Minor renaming refactor.