Renamed some attributes