Refactor aux method names