Moved serialisation of aggregation name to InternalAggregation