minor name changes to some names