minor name refactoring
cleanup