Renames and cleanup.