Adjustments to property naming