Renaming and adding variables