Merge pull request #438 from ebfe/fix-build-master

shuf, comm: fix build
Update collection paths/names