refactoring names, no functional changes