Refactored for consistent naming