Corrected some names for JSON communication