Rename and cleanup.