changes in variable names

Some changes to avoid duplicate names in scripts already created