Genericized the renamer