Renamed day into dayOfMonth and dayOfTheWeek into dayOfWeek