Sorting out details of renamePN
WIP