Merge "Yangman - validate collection name, ..."