XD-466 - renamed JSon to Json and minor changes per PR review comments