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