Renaming a couple of variables