Update for calendar.el name changes.