change date and timedelta to use full names since the names are kind of general