update scripts to define all names in variables