Revert a bad merge and collection name adding.

The collection name matter is a reversion of commit
46d01538c9f7f200797981a1d6369584ab64a4b2.
Retain errors and object for polymorphic serializers.