Renaming variables to properly reflect its content