Renamed Entity classes agin :)