minor name changes etc