Renamed classes appropriately