refactoring names, in progress