Added normalization of calendar names