Small var name changes