Reverting renaming fo CalendarEvent.