Tidy up names somewhat.