Minor method naming change and refactoring