Renamed some variables.
Property names are now JSON encoded.