Fix names in yield aggregator