Rename aggregator.* to aggregate.*