Fix some collection names