changed JSON keys to proper ones