Refactored to new names