Improve naming rules.
Update to work with changes to collect algorithm.