Renamed some more properties