small name refactor