Changed some json objects var names for greater consistency of output.