Bug fix with collection names