renamed all the things
JSON unmarshalling in place