minor name refactoring