Update for Top PAG Validation code
Merge pull request #6609 from ebouvier/UpdateNamesForTopValidationCode

Update for Top PAG Validation code