Renaming some variables according to naming rules
Renaming variables