Variable name changes for descriptiveness
Upgrade to recommended project settings.