Renamed ContentCatalog to HtmlContentCatalog