Refactor several method names