WIP on making renamePN work on a limited scope, to ease duplication of decls