Internal naming refactor.