Few wee changes to names of things.