Update collection paths/names
Merge pull request #440 from ebfe/fix-build-master

Update collection paths/names