Simplification and Renaming.