- minor name changes