Reverted name to CollectionTimer; other name and minor changes.