Refactor names to better match what things do.