Renamed catalog.Site to catalog.Datastore