Slight naming refactor.