Fixed conflicting pyc, updates collection names