Renaming a few variables