Refactored to consistent naming convention.