Following the discussion about HCatalog libraries, we should continue to call this "HCatalog" and use the HCatalog APIs, no?