Continue to allow the "function form", but disallow the "property form" of all the names indicated in org.hibernate.persister.collection.CollectionPropertyNames. E.g. allow from Person p where size(p.addresses) = ? but begin to deprecate the "property form": from Person p where p.addresses.size = ?.