Refactored property naming