Refactor of method names