tiny name refactoring