Renaming and simplifying.