Tweaked function names in calendar.