move the calendar name into the calendar definition