Renaming and minor refactorings.