Refactoring
Rename collector