refactor propert name matcher to remove the need for prefix