See #1147 This should be configurable. The default should be the old behavior. Names specified in `MappedCollection` should override any default.