changed JSON keys to match daemon
Merge branch 'json'