Renamed classes to include JSON prefix