Renamed some properties