Revert "Use decorator to map internal collection names"

This reverts commit 2c4d81bf5200a449e0316e3135b05b284f9f447f.