Renamed a bunch of properties