Use correct struct notation for JSON keys