More consistent JSON naming and better JSON Socket support