Refactor method names