Quick mockup of collectionName solution to issue #6