Renamed EntityNotFoundException to NotFoundException