Refactor naming on methods