some naming refactoring