Changed the naming of the methods on the AggregatorFactory to be consistent.