Renamed keys for properties to match convention