refactoring class and method names