Renaming AggregateState Infrastructure