Rename Catalog to DefaultCatalog to underscore options for alternative
implementations of ICatalog.