rename Collection => CollectionProxy, EmbeddedCollection => EmbeddedCollectionProxy