renaming vars to keep with the standard of the project