Genericized renamer is working