shorten some names, and fix spelling error