HM/JPM: AverageScoreCollector renamed to AggregateScoreCollector (multiplication instead of average)