minor name changes