Rename and refactor.