use entity name when creating index in collection.
due to the change in collection class.