Small changes to the property names