Changed some VAR names in scripts