Renaming cleanup.