More refactoring of PDXNameFinder
Resolved all constraint issues with storyboards