Naas will host Irish racing's return fixture June 8, with the Tattersalls Irish Two Thousand Guineas (G1) and One Thousand Guineas (G1) rescheduled for June 12 and June 13 in Horse Racing Ireland's schedule revealed May 17.