Renaming and other refactoring.