Update for Top PAG Validation code

Update of most path names (as in #6565).