*9044* Clean up JSON message conventions