Rename MuffinClient.Catalog to AggregateCatalog