Change collection name and add clean up task