Changes for rename vars