refactor for consistent naming