Fix tornado cloud names (#9244).