Rename Aggregation to Interval to be consistent with the UI package.