Refactoring of method names