Rename the unique token properties to match raw JSON and avoid weirdness