minor name fixes