Rename Aggregate.h to AggregatePrimitive.h