Renamed entities to resources