Renamed Entities to Entity