refactored names of calendar utils.