Refactor | Beverly | rename methods