Resolves #23
Incorporating review feedback
Merge pull request #29 from trunkclub/fix-collection-generator-naming

Resolves #23