Renamed a few of the properties