little naming refactoring