[#65] Variable renaming