Rename vars,