Refs #1260 Rename @Aggregation to a more correct term
Refs #1260 Rename @Aggregation to a more correct term

dimone-kun/cuba,dimone-kun/cuba,dimone-kun/cuba,cuba-platform/cuba,cuba-platform/cuba,cuba-platform/cuba