Renaming and minor refactoring.