Collator renamed to Collate.