Rename CalendarUtils to non-plural to match naming scheme