Improved calendar naming.