CAL-658 Update Calendar labels