Changed calendar to use new date names