shorten and fix a few names