refactoring a lot of names