Tweaks to calendar naming.