Refactoring: renaming.