Further tweaks for calendar name.