tidy language
Merge pull request #255 from mikedewar/nametidy

tidy language