Fixing various json keys