Support renaming of different variable types separately.