Naming refactor.