review changes. Rename variables, validation in groovy form, changeset typo