Replace NameSupport with PrefixNameGenerator
Use AggregationNameGenarator in isolateAggregation rewriter

o add an extra test