Rename json to be more specific and change affected code

* Gotta run now