Renaming and clean up.