Use better property names