i# This is a combination of 2 commits.

added required changes for validators to avoid duplicate names TRUNK-15