A few fixes in some of the terminology used.