Refactoring and renaming.