Fix Json type definition naming