small name refactoring/cleanup