Refactored property names