fixed aggregation date types namings