Renamed json classes